Commit Graph

168 Commits

Author SHA1 Message Date
Firecage ee3e8d2846 merge conflict fix 2017-10-05 11:22:57 +02:00
Firecage 2ae0380fef Does some code standardization/consistency 2017-10-05 11:13:47 +02:00
Emmett Gaines e16fd1b151 Makes shuttle movement a bit smoother and faster (#31255)
* uses CHECK_TICK where it's acceptable

* cleanup
2017-10-05 09:30:32 +02:00
Emmett Gaines 6573100acf fixes shuttles creating duplicate area types (#31008) 2017-09-26 14:25:52 +02:00
Jordan Brown 512889e5c3 Merge pull request #30697 2017-09-14 12:25:09 -04:00
Emmett Gaines 67e284cd4f multi-tile object fix (#30674) 2017-09-14 09:19:20 +02:00
ninjanomnom 9f0b6c7073 fixes transit parallax 2017-09-13 13:10:43 -04:00
KorPhaeron 10a3238fd6 Makes the station Z level into a list instead of a single define (#30297)
* Makes Station Z Levels a global list

* Things didnt get committed

* Define

* Removes files

* Fix mind.dm

* Wrong list name

* (

* Fixes rev checks and signpost

* Makes it actually compile

* Signpost fix

* I hate these sign posts

* Never use the web editor
2017-09-11 13:39:52 -04:00
AnturK e5fc9b1e94 Fixes shuttle name on ramming. 2017-09-06 10:36:23 +02:00
Jordan Brown 63593226be Changes shuttle port direction var from an angle to a dir (#30167)
* Converts port_angle to port_direction

* Remove old ass comment
2017-09-05 09:41:28 -05:00
AnturK 99a421491f Fixes BYOS (#30356)
* Fixes BYOS

* Uses defines on dock checks.
2017-09-03 11:46:11 -03:00
ninjanomnom 477bc11aa2 Removes the double loop 2017-08-28 16:31:16 -04:00
Cruix 3274ad4f12 The syndicate shuttle can now fly anywhere on the station z-level (#29909)
* Updated advanced camera consoles to be more generic

* Renamed /obj/machinery/computer/camera_advanced/proc/EjectUser() to /obj/machinery/computer/camera_advanced/remove_eye_control()

* Added shuttle nagivation computers

* Added the syndicate shuttle computer to maps
Fixed missing icons
Fixed compile error

* Made jumpto_ports use hashset behavior

* Added qdeleted checks
2017-08-22 10:36:43 +12:00
Emmett Gaines 03eca85d6f Slight on_move.dm rewrite (#30020)
* Minor on_move.dm rewrite

Makes it easier to implement new args
Makes stationary docks move as intended
Some cleanup

* Removes the defines
2017-08-22 09:37:07 +12:00
Ian Turk 7460f2c5b8 Replaced flags with flags_1 2017-08-16 13:01:15 -06:00
shizcalev 22764665c9 CentCom Standardization 2017-08-07 19:04:27 -04:00
Xhuis a3b543bd42 Fixes shuttles rotating improperly 2017-08-03 20:56:08 -04:00
ninjanomnom 2916551d81 fixes pod doors 2017-07-19 09:13:47 -04:00
ninjanomnom c7cf39cf29 clean up jumpToNullSpace 2017-07-19 08:00:30 -04:00
ninjanomnom 2d14a3e993 fixes typecache again 2017-07-19 00:34:45 -04:00
ninjanomnom 9da8be52ed fixes one bug and brings another out of the woodwork 2017-07-18 23:03:16 -04:00
Emmett Gaines 1d201939ba [Ready] Shuttle dock() rewrite (#29049)
A complete rewrite of the dock proc for shuttles to make it more maintainable and readable and also bring over some new features while we're at it. This allows for multi-area shuttles and more control over the effects of anything being moved.

Areas, and movable atoms all have (before|on|after)ShuttleMove procs, turfs have (from|to)ShuttleMove procs which are called the same as beforeShuttleMove.

All ShuttleMove procs have been moved to a single file in the shuttle module.

Stationary docks will have their baseturf_type and area_type modified in maps once the problems have been worked out.
2017-07-17 12:17:56 +12:00
ShizCalev 59ef81245b Changes some 1s and 0s to TRUE and FALSE (#29144) 2017-07-10 10:31:34 -04:00
AnturK a2b21ab93d Fixes pods not counting as escape (#28988) 2017-07-03 19:13:34 -03:00
AnturK f771ea7082 Fixes emergency shuttle endgame state (#28870) 2017-06-28 10:30:59 -03:00
AnturK 0c3edf1ff7 Shuttle engines affecting travel time (#28564) 2017-06-25 22:52:06 -03:00
AnturK 868d374fab Moves transit space to separate z level. (#28598)
* Transt Z-level

* Just in case

* Map edit

* I guess i forgot to push the few lines i changed at work.

* This one too

* Bluh
2017-06-20 11:31:32 -04:00
Joan Lung 1b7c4a63dc Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual (#27344) 2017-05-17 22:54:54 -05:00
AnturK ba37e1f70c Fixes rcds working on transit space (#27258) 2017-05-15 09:05:47 -03:00
KorPhaeron 1ef9f6606a Elevators (#26937) 2017-05-06 18:29:33 -03:00
oranges d95e859e5d Merge pull request #26386 from ChangelingRain/initialnew
New() goes in the trash, we've gotta Initialize()
2017-04-27 10:15:10 +12:00
Cyberboss 729010bbb2 Unorphans the blackbox (#26129)
Moved sql_poll_population from server_maint to this new SS. Moved few remaining server_maint tasks to SSping and deleted it.
2017-04-27 10:04:57 +12:00
Joan Lung 228df13447 Merge branch 'master' of https://github.com/tgstation/tgstation into initialnew
Conflicts:
	code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm
	code/modules/station_goals/bsa.dm
	code/modules/vehicles/atv.dm
2017-04-25 07:32:06 -04:00
Joan Lung dc0e007a23 A bunch of Initialize()s now have return values (#26464) 2017-04-25 10:51:40 +02:00
c0 3b0b963609 Fixes wires breaking on shuttle movement/rotation 2017-04-21 11:20:00 +03:00
c0 7db57a9f25 Fixes bugs with pipes on shuttles breaking, acting weird and losing gas 2017-04-20 15:42:26 +03:00
Joan Lung db9d86a39e New() goes in the trash, we've gotta Initialize() 2017-04-19 18:22:26 -04:00
Cyberboss 7b9282cb07 Revert "Shuttle movement immediately updates lighting objects" 2017-04-13 18:56:08 -04:00
Cyberboss 7d927e6bfa Shuttle movement immediately updates lighting objects 2017-04-07 15:44:48 -04:00
Cyberboss 9e1ef0ffe2 Global variable wrappers (#25325)
* Add the system for managed global variables

* Travis ban old globals

* So you CAN inline proccall, that's neat

* Fix that

* master.dm

* Remove the hack procs

* Move InitGlobals to the proper spot

* configuration.dm

* Fix the missing pre-slash

* clockcult.dm

* This is probably for the best

* Doy

* Fix shit

* Rest of the DEFINES tree

* Fix

* Use global. for access

* Update find_references_in_globals

Always hated that proc

Whoever made it must've bee a r e a l idiot...

* __HELPERS tree

* Move global initialization to master.

Fix the declaration

* database.dm

* Dat newline

* I said DECLARATIVE order!

* Here's something you can chew on @Iamgoofball

* game_modes.dm

* Fix this

* genetics.dm

* flavor_misc.dm

* More stuff

* Do it mso's way. Keep the controllers as global

* Make master actually see it

* Fix

* Finish _globalvars/lists

* Finish the rest of the _globalvars tree

* This is weird

* Migrate the controllers

* SLOTH -> GLOB

* Lighting globals

* round_start_time -> ticker

* PAI card list -> pai SS

* record_id_num -> static

* Diseases list -> SSdisease

* More disease globals to the SS

* More disease stuff

* Emote list

* Better and better

* Bluh

* So much stuff

* Ahh

* Wires

* dview

* station_areas

* Teleportlocs

* blood_splatter_icons

* Stuff and such

* More stuff

* RAD IO

* More stuff and such

* Blob shit

* Changeling stuff

* Add "Balance" to changelogs

* Balance for changelog compiler + Auto Tagging

* Update the PR template

* hivemind_bank

* Bip

* sacrificed

* Good shit

* Better define

* More cult shit

* Devil shit

* Gang shit

* > borers

Fix shit

* Rename the define

* Nuke

* Objectives

* Sandbox

* Multiverse sword

* Announce systems

* Stuff and such

* TC con

* Airlock

* doppllllerrrrrr

* holopads

* Shut up byond you inconsistent fuck

* Sneaky fuck

* Burp

* Bip

* Fixnshit

* Port without regard

* askdlfjs;

* asdfjasoidojfi

* Protected globals and more

* SO MANY

* ajsimkvahsaoisd

* akfdsiaopwimfeoiwafaw

* gsdfigjosidjfgiosdg

* AHHHHHHHHHHHHHHHHHHHHHHH!!!!!

* facerolll

* ASDFASDFASDF

* Removes the unused parts of dmm_suite

* WIP

* Fix quote

* asdfjauwfnkjs

* afwlunhskjfda

* asfjlaiwuefhaf

* SO CLOSE

* wwwweeeeeewwwww

* agdgmoewranwg

* HOLY MOTHER OF FUCK AND THATS JUST HALF THE JOB?!?

* Fix syntax errors

* 100 errors

* Another 100

* So many...

* Ugh

* More shit

* kilme

* Stuuuuuufffff

* ajrgmrlshio;djfa;sdkl

* jkbhkhjbmjvjmh

* soi soi soi

* butt

* TODAY WE LEARNED THAT GLOBAL AND STATIC ARE THE EXACT SAME FUCKING THING

* lllllllllllllllllllllllllllllllllllllllllll

* afsdijfiawhnflnjhnwsdfs

* yugykihlugk,kj

* time to go

* STUFFF!!!

* AAAAAAAAAAAAAAAAAHHHHHHHHHHHHHHHHHHHHHHHHHHH!!!!!!!!!!!!!!!!!!!!!!!

* ngoaijdjlfkamsdlkf

* Break time

* aufjsdklfalsjfi

* CONTROL KAY AND PRAY

* IT COMPILEELEELELAKLJFKLDAFJLKFDJLADKJHFLJKAJGAHIEJALDFJ!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

* Goteem

* Fix testing mode

* This does not belong in this PR

* Convert it to a controller

* Eh, fuck this option

* Revert controllerization Ill do it some other time

* Fix

* Working controllerization

* FOR THE LOVE OF CHRIST PROTECT THE LOGS

* Protect admins and deadmins

* Use the inbuilt proc
2017-04-06 23:26:13 -06:00
Cyberboss bfdc346c52 Hyperspace ripples now animate at the rate of the arriving shuttle (#24947)
* Ripples animate at rate of the arriving shuttle

* Make it use Initialize while we're here
2017-03-13 11:34:58 +13:00
Cyberboss 898fabfb4b Adds feedback for mobs gibbed by shuttles (#24923)
* Adds feedback for mobs gibbed by shuttles

* Use the ckey

* Dew it right
2017-03-11 17:12:34 +13:00
Cyberboss e48564d941 Arrivals Ferry (#24694)
* Highlight docking ports in TESTING

* Buckle arrivals to their seats

* Fixes shuttle/Initialize not calling the base

* Arrivals docking

* Use forceMove so the shuttle effect starts

* Forgot this check

* Fixes

* Needful

* Fix this shit

* Line endings?

* Double check, fix sound

* Remove empty if

* Fucking lists

* Fix parallax and ghosts

* Ghost fix

* GHOST

* Fix shit

* Fix parallax + config

* I lied slightly

* Hyperspace sound refactor

* Finish fixing the maps + doors

* Fix the sound not playing

* Consoles + area fix

* Updates default config

* Fix line endings

* Safety checks

* Damage checks

* This should be down here

* Clean some stuff up

* Fix a few things on Delta and Omega

* Delete the useless air alarm on Pubby's shuttle

* Fixes #24727

* Always the fucking line endings

* Fix this negative check

* LINE ENDINGS!!!!!

* Revert to master

* Redo the changes

* Fix the sound not repeating

* Readds the shuttle door

* Fix people disabling latejoins
2017-03-10 14:19:34 +13:00
PJB3005 f11c558c99 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-02-12 16:35:57 +01:00
Core0verload 4b1eed0c8e You can now emag the escape pods to launch them (#23815)
* You can now emag the escape pods to launch them in any code

* micro optimisation
2017-02-10 20:35:18 +13:00
PJB3005 8ce6ae2b87 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-02-08 14:30:23 +01:00
Cyberboss 2aef76bdce Nuclear bombs now actually detonate (#22586)
* BOOM

* Forgot this check

* Fix remaining objectives

* This is better

* MSO params

* >When you copy paste directly from the comment

* Merge fixes

* Revert "Fix remaining objectives"

This reverts commit b1d1bf40f615019bb57088c24fae8f89c5d2e834.

* Revert "Forgot this check"

This reverts commit cea6ad2381d44a44ef3a93064997454cf7b1ccf5.

* After all that work I did to make objectives work...

* Oh this is important
2017-01-30 09:41:42 +13:00
Cyberboss 5959ac32cc Refactors atom/Initialize. Fixes ruins being initialized twice (#22778)
* Refactors atom/Initialize

Captialized for compiling correctness and to be more inline with Destroy

Will now be called from atom/New if the world initialization loop in SSobj has already run. Should always call the base.

Now comes with the `roundstart` parameter indicating whether or not it was called by SSobj or atom/New

Other fixes/tweaks:
- Renamed a proc called Initialize in abduction consoles to Setup
- Removed /obj/item/device/radio/headset/headset_sec/department: Broken and referenced literally nowhere in the code
- Removed a spawn from the Initialize of turbine_computer which made literally zero sense
- Generalized the proc which fixes RND servers with no id set

Reasoning: It's better to check roundstart per function than to have to duplicate code in New and Initialize. Think of it as a safer New for atoms. If we move enough stuff to it, initial map load performance will increase due to less New calls

* Fixed a thing

* Actually, fuck the police

* >Expecting a merge without errors

* >Not calling ..() in New

* Sanic

* Fix the headset bug

* Makes sure the map loaders dew it right

* Fixes ruins being initialized twice

* Rename roundstart -> mapload

* Revert "Rename roundstart -> mapload"

This reverts commit 667c327fd2ccfa3ce4f4db52eac03f9e8b0f6812.

* Remove unrelated change

* A more direct solution to map loads

* And now we shouldnt need this warning

* Add the new var to SSobj recovery

* Revert "Revert "Rename roundstart -> mapload""

This reverts commit dee07dbd5e4696554ac43aae5b91cce743b9b9e0.

* Line endings
2017-01-23 09:37:45 +01:00
Kyle Spier-Swenson 12570805bd Closes the Pool. (#23150)
* Delete pool.dm

* Removes usage of PoolOrNew

* Wrap up
2017-01-22 16:00:23 -05:00
PJB3005 7356e80484 hey that should be everything except making it compile. 2017-01-17 22:08:27 +01:00