Commit Graph

40933 Commits

Author SHA1 Message Date
kevinz000 73389f2be5 Fixes forensics runtimes (#34336) 2018-01-11 22:11:46 -05:00
Leo 1a03b8ac21 Merge pull request #34270 from tgstation/Cyberboss-patch-3
Fixes toolarm grammar
2018-01-11 21:11:52 -02:00
Leo 307581c195 Merge pull request #34282 from Cyberboss/ClosetFix22
Fix hitting closets with wrenches
2018-01-11 21:11:30 -02:00
AnturK d777ca21cb Fixes mind transfers (#34329)
* Fixes mind transfers

* Don't really see how this is better but sure.
2018-01-11 16:27:56 -05:00
oranges a49c5561be Merge pull request #34265 from tgstation/welostcountofhowmanycookieswerespawnedshutitalldown
fixes safety check
2018-01-12 09:12:13 +13:00
kevinz000 19322f10b9 Fixes vehicle action handling ordering (#34146)
* Fixes cleanup not working for vehicle actions

* Wrong ordering

* Update vehicle_actions.dm
2018-01-12 09:11:07 +13:00
kevinz000 f27948eaa3 Fixes megafauna being able to port through jaunt tunnels due to snowflake code (#34164)
* Fixed megafauna porting through jaunt tunnels

* Update portals.dm
2018-01-12 09:09:57 +13:00
oranges 6790f8e193 Merge pull request #34117 from ShizCalev/medbot-tweak
Makes medbots unable to inject you if you are are fully covered with THICKMATERIAL.
2018-01-12 09:06:45 +13:00
Tad Hardesty 827c4b3f99 Replace hardcoded z-level numbers with a trait system (#34090)
* Add basic structure of z-level traits

* Restore space transitions and add z-level debug verb

* Restore proper ruin spawning and transit level creation

* Replace station_z_levels and related checks with traits

* Eliminate more uses of ZLEVEL_{STATION_PRIMARY,LAVALAND}
2018-01-12 09:05:49 +13:00
arsserpentarium c86fc91b55 [READY]Pulling claw 2 (#33817)
Pulling claw is integrated circuit,which allows drones to pull things.
2018-01-12 09:02:56 +13:00
oranges eb9180d7d6 Merge pull request #34204 from ShizCalev/chem-macro-feedback
improves chem macro feedback
2018-01-12 09:02:15 +13:00
oranges 277c2bbf65 Merge pull request #34206 from ShizCalev/fireaxe-drop
Fixes twohanded weapons not unwielding when you lose an arm.
2018-01-12 09:01:46 +13:00
Jack Edge 94ffcd1844 Rephrase the timing amounts 2018-01-11 19:31:16 +00:00
Jack Edge 265851a3dd Removes ash flora being harvested on roundstart
There is a lot of flora on lavaland, and 15% is a lot of them. That
means for a test server, you've got a whole bunch of timers for no real
reason. Nothing eats the flora except for humanoids, and none of them
are moving around before the roundstarts. Which means, 95% of the flora
will have regrown by the time you actually see it.

- Removes the "no_drop" var from the proc, because it's no longer used.
2018-01-11 19:26:43 +00:00
ShizCalev cdb53fcbe9 Fails travis on common mapping mistakes 2018-01-11 13:36:06 -05:00
Jordan Brown 49e94049b5 Fixes poker tables not being deleted after Narsie touches them 2018-01-11 12:20:05 -05:00
Tad Hardesty 2cf011f0cc Fix airlock controller HTML 2018-01-11 05:32:56 -08:00
Tad Hardesty 42886ff263 Fix description of relabelled canisters
And also fix name propriety of BZ canisters.
2018-01-11 05:21:19 -08:00
AnturK fca4c99aea Fixes beams failing to qdel properly. Maybe. (#34254) 2018-01-11 05:02:20 -05:00
Kyle Spier-Swenson e31b2f749b Makes stoppable timers faster. (#34208)
* Makes stoppable timers faster.

* Missed a spot
2018-01-11 04:54:07 -05:00
Jordan Brown db1e201e27 Fixes error if next_map.json is missing (#34222) 2018-01-11 04:53:42 -05:00
Jordan Brown ccbdb551bd Stops the dbadmin warning if SQL_ENABLED isnt set (#34223) 2018-01-11 04:52:06 -05:00
AnturK f44c8bf694 Fixes potato cells missing wires (#34253) 2018-01-11 04:50:08 -05:00
Tad Hardesty 683c902383 Replace CentComm with CentCom in deadchat message (#34249) 2018-01-11 04:36:33 -05:00
Tad Hardesty b9a620472a Add JMP buttons to mapping debug verbs 2018-01-10 21:57:15 -08:00
kevinz000 22c89a2390 Update constructs.dm 2018-01-10 19:22:49 -08:00
Jordan Brown b9b9495071 Fixes configuration not loading 2018-01-10 20:10:32 -05:00
ExcessiveUseOfCobblestone 2b0aeec82e Adds Display Name Argument to Techweb Logging (#34216)
* Update _techweb.dm

* Replaces ID with the name of the tech web

* REVERT ON THE WEBBITOR

* Webbitor Blues

* removes "
2018-01-10 15:57:33 -08:00
Leo f62335f655 Merge pull request #34242 from Someguynamedpie/patch-1
Precision in timekeeping is important, okay.
2018-01-10 21:07:23 -02:00
Jordan Brown f574635356 Fix hitting closets with wrenches 2018-01-10 17:08:10 -05:00
Leo ca84aa200b Merge pull request #34168 from ShizCalev/dna-human-runtime
Corrects runtime when shooting humans
2018-01-10 20:04:22 -02:00
Leo ce05906450 Merge pull request #34177 from ShizCalev/pet-rename
Prevents renaming uniquely named pets.
2018-01-10 20:03:43 -02:00
Leo 993e14e22e Merge pull request #34189 from ShizCalev/test-area-tick
CHECK_TICK & logging for cmd_admin_areatest
2018-01-10 20:03:01 -02:00
Leo 1e42c5743c Merge pull request #34220 from tgstation/Cyberboss-patch-4
Stops the config warnings when there's no config.txt
2018-01-10 20:01:10 -02:00
Leo 3d0813d01a Merge pull request #34203 from tortellinitony/asayf
Makes a hotkey for asay
2018-01-10 20:00:08 -02:00
Leo 7ccd0f2e9e Merge pull request #34219 from Cyberboss/RemoveSetBackground
Removes usage of set background
2018-01-10 19:53:23 -02:00
Leo 86afa895b6 Merge pull request #34221 from Cyberboss/RemoveSortInstance
Makes sorts work before GLOB
2018-01-10 19:52:07 -02:00
Leo 309fa22b74 Merge pull request #34225 from Cyberboss/GetRevFix
Fixes getrev with no log file for master
2018-01-10 19:51:33 -02:00
Jordan Brown 91739c6aa5 Removes custom AI board no laws warning (#34226) 2018-01-10 19:46:55 -02:00
Leo 26d4e05d3d Merge pull request #34229 from Robustin/deconversionfix
Fixed cultists deconverting via holy water not giving a message
2018-01-10 19:46:01 -02:00
Leo 1aaf1e1c47 Merge pull request #34240 from Cyberboss/NewscasterFix
Fix newscaster href tokens
2018-01-10 19:44:21 -02:00
Leo 3977822a9d Merge pull request #34224 from tgstation/Cyberboss-patch-7
Adds some documentation to file2list
2018-01-10 19:43:53 -02:00
Jordan Brown 14a552cf51 Merge branch 'master' into RemoveSetBackground 2018-01-10 12:37:53 -08:00
Leo 3af46c802b Merge pull request #34232 from tgstation/Cyberboss-patch-9
Adds some drop_location()s
2018-01-10 18:25:41 -02:00
Leo e9354ce5f6 Merge pull request #34228 from tgstation/Cyberboss-patch-8
Fixes runtimes when no ruin configs are set
2018-01-10 18:23:30 -02:00
oranges 987f439a53 Merge pull request #34218 from Cyberboss/CompileCleanup
Cleans up __compile_options.dm
2018-01-11 09:18:15 +13:00
Jordan Brown ccedcb065b Update TGS API to 3.2.0.2 2018-01-10 14:41:24 -05:00
Jordan Brown 6edc1c4ea5 Fixes toolarm grammar 2018-01-10 13:02:19 -05:00
KorPhaeron c66ee9e069 Goats eat plant people 2018-01-10 11:31:34 -06:00
Jordie 7426cb616c fixes safety check 2018-01-11 04:24:09 +11:00