Commit Graph

39142 Commits

Author SHA1 Message Date
Jordan Brown a4ac68400a Merge pull request #31602 from AnturK/tunnels
Fixes diagonal tunnels
2017-10-13 10:13:57 -04:00
Jordan Brown d138a81bd4 Merge pull request #31614 from AnturK/zap
Fixes electrocution animation
2017-10-13 10:13:24 -04:00
Armhulen 882e561f8c Adds a fireball from the heavens as an admin smite (#31502)
* really gamers?

* yeah yeah YEAH

* cucked again!

* it works

* I SAID IT WORKS
2017-10-12 21:37:11 -04:00
Jordan Brown 40ffeff63c Merge pull request #31643 from duncathan/letsallsitdownbythefireplaceandwarmup
Activates global warming
2017-10-12 21:03:29 -04:00
Ashe Higgs 389db5e7f6 Stargazers are now station-restricted, and cogged APCs are now quiet (#31565)
* Clockwork power generator tweaks

* Includes a blob_allowed check
2017-10-12 17:32:08 -06:00
MoreRobustThanYou 99f8c92fc0 Adds sports bras (#31590)
* uguuu~

* Update sprite_accessories.dm

* Update sprite_accessories.dm

* make them an undershirt
2017-10-12 19:08:10 -04:00
duncathan 7ffea9285d who turned off the pilot light in the boiler room? no wonder it was cold 2017-10-12 16:18:38 -06:00
Jordan Brown bde243266b Merge pull request #31588 from ninjanomnom/shuttle-parallax
Fixes stationary mob parallax
2017-10-12 17:06:05 -04:00
oranges e4a63bbda0 Merge pull request #31631 from tgstation/Cyberboss-patch-2
Use legacy topic keywords lookup method
2017-10-13 10:05:43 +13:00
Jordan Brown 647237f32f Merge pull request #31582 from feemjmeem/smoke-log-announcing
Notify admins when someone activates a smoke machine
2017-10-12 17:03:15 -04:00
Jordan Brown 4cbfc4ab79 Merge pull request #31584 from AnturK/ruinshuttle
Fixes ruins spawning over shuttle docks
2017-10-12 17:02:23 -04:00
YPOQ eaeabcca6f Fixes canisters breaking multiple times (#31586) 2017-10-12 16:47:13 -04:00
vuonojenmustaturska 52239dd9fb Fixes foam darts on cardboard cutouts and shooting range targets (#31579) 2017-10-12 16:45:51 -04:00
Jordan Brown 193f4e571c Merge pull request #31585 from ShizCalev/empty-light-editor-fix
Fixes empty light fixtures showing as working lights in DM
2017-10-12 16:27:22 -04:00
Jordan Brown 015ae6959d Use legacy topic keywords lookup method 2017-10-12 15:52:44 -04:00
Jordan Brown 9a91eeb489 Add require_comms_key = TRUE to some topic that need it 2017-10-12 13:22:32 -05:00
ShizCalev 477384ce78 Refactors away mission & space ruin area code (#31512) 2017-10-12 11:46:30 -06:00
AnturK 309fa5f07a Fixes space transition (again) 2017-10-12 12:41:53 -05:00
kevinz000 6f6bdcd7d3 Adds tick check to ore boxes (#31396)
* Update satchel_ore_boxdm.dm

* Update satchel_ore_boxdm.dm

* Update satchel_ore_boxdm.dm

* Update satchel_ore_boxdm.dm

* Update satchel_ore_boxdm.dm
2017-10-12 11:38:56 -06:00
ShizCalev 0ca203d4da Fixes plastic explosive issues (#31549) 2017-10-12 11:37:15 -06:00
kevinz000 07e4158882 Update bomb.dm (#31557) 2017-10-12 11:36:09 -06:00
ShizCalev 49e5b23735 Fixes conveyor belt layering (#31569) 2017-10-12 11:34:11 -06:00
Jordan Brown d40722a749 Fixes adminwho having namecheck as a keyword 2017-10-12 12:22:24 -05:00
Jordan Brown 9c190eb3c7 Fixes topic key validation 2017-10-12 12:22:04 -05:00
Jordan Brown f944085ffb Fixes topic handlers 2017-10-12 12:21:33 -05:00
Jordan Brown b6a2517069 Merge pull request #31605 from AnturK/cryofix
Fixes cryo
2017-10-12 12:55:24 -04:00
duncathan salt a68d7ebd9a makes vacuums "cold", sort of (#31542) 2017-10-12 13:47:19 -03:00
Tad Hardesty b821006ce1 Fix lavaland turfs looking awkward to AIs (#31554) 2017-10-12 17:39:38 +02:00
kevinz000 f0670b743c Update material_container.dm (#31555) 2017-10-12 17:38:07 +02:00
Kyle Spier-Swenson 76b61e69cf Fixes client vv not working. (#31556) 2017-10-12 17:37:43 +02:00
Jordan Brown afeeb71986 Fix world/Topic calling the wrong handler proc (#31610) 2017-10-12 17:37:04 +02:00
AnturK 95d28b86ed Hallucination one 2017-10-12 16:47:56 +02:00
AnturK 208c6159fb Fixes electrocution animation 2017-10-12 16:35:07 +02:00
kevinz000 c43e205959 loc -- > forcemove (#31176)
* manually done

* Update syndicatebomb.dm

* Update robot.dm

* Update atoms_movable.dm

* Update syndicatebomb.dm

* Update devil.dm

* Update bedsheet_bin.dm

* Update vending.dm

* Update bedsheet_bin.dm

* Update atoms_movable.dm

* Update syndicatebomb.dm

* Update vending.dm

* Update bedsheet_bin.dm

* Update devil.dm

* Update door_assembly.dm
2017-10-13 00:12:03 +13:00
AnturK 9063fea181 Fixes cryo 2017-10-12 12:13:58 +02:00
AnturK 8154e5db02 Fixes diagonal tunnels 2017-10-12 08:45:16 +02:00
AnturK a001f58480 _1 2017-10-12 08:08:10 +02:00
duncathan salt 945a58cf85 unfucks filters (#31599)
* gas IDs -> gas datum paths

* updates parse_gas_string() to handle both paths and IDs

* fixes compile errors

* fixes parse_gas_string() ignoring amounts of gas

* fixes roundstart jetpack runtimes

* fixes filters

* fixes map-edited filters

* fixes empty canister runtimes on initialization

* unfucks filters

* updates maps to match
2017-10-12 08:07:01 +02:00
Ashe Higgs b6a921ae3f Reebe cogscarabs have infinite power and can recite scripture during non-clockcult rounds (#31282)
* During non-clock rounds, scarabs get more stuff

* Actually, admins might want to make scarabs...

* That's a thing
2017-10-11 22:25:39 -04:00
Jordan Brown 0193bdd668 Datumizes world/Topic (#31543)
* Datumizes world/Topic

* active_players requires comms_key
2017-10-12 14:46:51 +13:00
ninjanomnom 7c8c8a6d5e fixes stationary client parallax 2017-10-11 21:29:55 -04:00
Jordan Brown 7e54c70c49 Adds round id to the banning panel (#31545) 2017-10-11 20:42:16 -04:00
Mercenaryblue 05e1f521e6 Added Banana Peels Inhand Sprites (#31551)
Added in-hand Banana Peels sprites.
Default, Mime, and Bluespace.
2017-10-11 20:41:27 -04:00
PKPenguin321 ec0b236473 Removes unwelding a singletank (#31550)
Fixes #27341
2017-10-11 20:41:04 -04:00
Incoming5643 0c8e245c56 when cleanbot cleans a tile, it will now fully cleans the tile (#31548)
As opposed to taking out one stain at a time
2017-10-11 20:40:36 -04:00
oranges 515428f63f Merge pull request #31500 from Armhulen/patch-7
sleeping carp grabs now put out a message
2017-10-12 11:09:48 +13:00
Armhulen 15241d90c5 Mega Carp Re-Carpening: Carpatastrophe! (#31365)
* healing, thank you kor!

* why isn't this working

* balance sucks

* fixed, whoops

* cuts-the-fat

* yay

* fixes

* cool beans
2017-10-12 11:07:53 +13:00
Jordan Brown 73fb6ad339 Make SStgui actually read the html from the disk at runtime (#31464)
* Make SStgui actually read the html from the disk at runtime

* Remove the comment

* Back to "
2017-10-12 11:04:30 +13:00
ShizCalev 9c59171afe Fixes empty light fixtures showing as working in DM 2017-10-11 16:53:23 -04:00
AnturK 1df4082525 Fixes ruins spawning over shuttle docks 2017-10-11 22:46:50 +02:00