Commit Graph

40933 Commits

Author SHA1 Message Date
ninjanomnom dc359635ca Makes enterTransit check canMove and sets mode to idle 2017-10-30 17:54:08 -04:00
oranges 3dd3e4946a Merge pull request #32131 from KorPhaeron/protecthumanauthority
Changes to protect human authority
2017-10-31 09:32:45 +13:00
oranges d17689e52a Merge pull request #32153 from tgstation/Cyberboss-patch-4
Removes force from slappers
2017-10-31 09:30:16 +13:00
oranges 7a8a781bdd Merge pull request #32128 from Cyberboss/LocateFix
Use associative list instead of `in`
2017-10-31 09:24:42 +13:00
kevinz000 0eeddd81f7 tail wag fix
actually fixes not being able to stop wagging your tail this time
2017-10-31 09:23:54 +13:00
Emmett Gaines 800ff38c95 New ambience for ash storms (#32213)
song name?
2017-10-31 09:22:11 +13:00
Jordan Brown 379869ef6b Fixes allow_custom_shuttles default (#32221)
* Fixes allow_custom_shuttles default

* Fix the check
2017-10-31 09:20:34 +13:00
Jordan Brown 8c8cdd7461 Merge pull request #32134 from Anonmare/patch-8
Makes rollerbeds normal-sized items
2017-10-30 16:09:22 -04:00
Jordan Brown dfcf1cd299 Merge pull request #32222 from AnturK/ignoreprovement
Ignore verb now also shows ghost names
2017-10-30 16:05:58 -04:00
Jordan Brown 5bd01c8f14 Merge pull request #32146 from PKPenguin321/patch-20
Fixes rollies not being effective
2017-10-30 16:00:30 -04:00
jughu 36e7f1e992 Removes statues from the gold slime pool (#32123)
* Update statue.dm

* Update statue.dm
2017-10-30 15:53:04 -04:00
Jordan Brown 32cf0f9e04 Merge pull request #32150 from MrStonedOne/patch-442
Meteor gating tweaks
2017-10-30 15:50:35 -04:00
Jordan Brown 80cd089035 Merge pull request #32191 from AnturK/latetraitorfixup
Fixes latejoin/mulligan traitors.
2017-10-30 15:50:05 -04:00
AnturK fe40c71262 Dropped redundant to string. 2017-10-30 20:49:35 +01:00
Jordan Brown f8156a7b17 Merge pull request #32210 from kevinz000/patch-361
fixes clockcults appearing as grey box on sechuds until they reequip their id
2017-10-30 15:41:41 -04:00
Jordan Brown 677eefc462 Merge pull request #32211 from YPOQ/borgupgradefix
Fixes cyborg upgrades not applying to held items
2017-10-30 15:40:30 -04:00
Jordan Brown 4ed8195dc1 Merge pull request #32209 from YPOQ/mechrechargerfix
Fixes mech recharger integrity bar
2017-10-30 15:40:10 -04:00
kevinz000 8b9cb750db fixes radios being perma-stuck on when emped (#32212)
* fix radio emps

* woops forgot something!

* Update headset.dm
2017-10-30 15:38:24 -04:00
Jordan Brown 0b51afd858 Merge pull request #32215 from kevinz000/patch-363
fixes sinks applying baton stunforce to stutter without proper conversion between tick and mob life counting.
2017-10-30 15:37:03 -04:00
vuonojenmustaturska 6d8681f9e0 Deterministic output slots for smartfridges (#32225)
* a spooky commit

* It is too late, the skeleton is already inside you

* mexican river dolphins for halloween 2018

* Compiler warnings for halloween 2018
2017-10-30 15:34:28 -04:00
Ashe Higgs 695fa5f220 You can now hide grenades in plushies (#31986)
* Adds plushie grenades

* Now it compiles!

* Cyberboss' review

* Adds logging, handle_atom_del

* ..()

* Logs without user

* Webeditor 1!

* Webeditor 2: Return of Webeditor
2017-10-30 15:32:52 -04:00
bawhoppen e9cea4d664 Fixes old simple animal humanoid issues (#32214)
* fixes issue

* ignore that

* Spacebattle doesn't even open in DM

* Conflicts fixed for real

* Fixes pathing weirdness

* wonderful
2017-10-30 12:48:56 +01:00
Jordan Brown 82a4ba34f0 Fixes TakeComponent (#32156)
* Fixes TakeComponent

* Add the note about OnTransfer and COMPONENT_INCOMPATIBLE

* Fix behaviour

* Missed datum.dm
2017-10-30 09:52:18 +01:00
ninjanomnom d8b441f543 makes greyscaled cables' color viewable in map editing 2017-10-30 03:59:28 -04:00
ninjanomnom d8af045434 Fixes singularity objects and logging 2017-10-30 01:36:35 -04:00
bgobandit 41f6a26b24 Adds force to items that really should hurt when hit by (#32200) 2017-10-30 12:49:31 +13:00
PKPenguin321 dda2e627a6 welder refuelling hotfix 2017-10-29 17:22:52 -05:00
PKPenguin321 f46f3726b4 Allows filling welders from open containers that have welding fuel in them (#32143)
🆑
tweak: You can now use beakers/cups/etc that have welding fuel in them on welders to refuel them.
/🆑

Closes #31339
2017-10-30 10:55:06 +13:00
PKPenguin321 fc92519d45 Fixes filling smoke machines with pills (#32140)
Fixes #32102

Checks for the OPENCONTAINER flag after seeing if the object being used to fill the smoke machine has reagents in it
2017-10-30 10:00:32 +13:00
Ashe Higgs def425f9f4 Excludes clockwork wargolems from golem mutation toxin, nerfs normal clockwork golems (#32041)
* Excludes wargolems from mut. toxin

* Doggone debug code!

* Static type list
2017-10-29 19:56:15 +01:00
KorPhaeron c2106226db Halloween race fixes (#32174)
* Dullahan Testmerge

* Dullahan fix

* Fixes vampires not recieving bat spell

* Even less blood drain

* Higher drain

* Nevermind

* Makes things compile

* Dullahan action name, space bat flight

* Fixes buckling issues with shapeshift

* Removes excess lines
2017-10-29 18:31:26 +01:00
AnturK c92a741a8c No repeats 2017-10-29 17:27:37 +01:00
AnturK 98ba63689f No cheating. 2017-10-29 17:12:42 +01:00
AnturK b7dcef1655 Ignore now also shows ghost names 2017-10-29 17:06:15 +01:00
bgobandit fb1d941aa0 Adds new valentines; replaces outdated/shitty ones. (#32144)
* adds valentines, cuts old references

* Adds valentines, replaces outdated ones

* more entendre-y
2017-10-29 11:03:50 -05:00
Armhulen 7fa4b31f79 Ice Spiders now use frost oil instead of toxin (#32080)
* PARASTENG!!

* just monika
2017-10-29 12:02:35 -04:00
Kyle Spier-Swenson 940397fb0d Events take pre-game lobby time into account (#32154)
* Events take pre-game lobby time into account

* Friends don't let friends code without coffee.

It would appear that  I have no friends

* i blame cyberboss
2017-10-29 11:36:44 -04:00
Jordan Brown f6ce339547 Merge pull request #32185 from AnturK/wiztypo
Fixes TP wizarding.
2017-10-29 11:36:15 -04:00
Jordan Brown 626302c1bf Merge pull request #32161 from ninjanomnom/512-experimental
512 forward compatibility merge
2017-10-29 11:27:46 -04:00
Jordan Brown 9375965fd7 Fixes map_config validation (#32206) 2017-10-29 16:25:50 +01:00
Mercenaryblue f7455c6d97 Spooky Spectral Instruments (#31966)
* [dooting intensifies]

Spectral Instruments added
To be used with Spooky Skeletons.

* Spectral Re-balance

The spectral instruments no longer stun living creatures.
Text make you retain your loyalties now.

* Requested Changes

Added variable "too_spooky".
Defines if it will spawn a new instrument.
Re-balanced damage to 5 hits average per conversion.
Added admin notice to changelog.

* Loyalty text fix

* Spooky Trumpets

Removed comment.
Added missing spookiness.

* Spooky Dooting

Major Overhaul.

removed /brass/
Spooky Dooting is now a component.
Boneless humanoids no longer lose stamina.

* Spooky Dooting

mk2
2017-10-29 13:34:39 +01:00
vuonojenmustaturska 8fa5fc9ca8 one more thing to allow more mobs to qdel nicely (#32168) 2017-10-29 13:14:16 +01:00
vuonojenmustaturska 3c0adb1e40 Actually fixes meteors, again (#32162)
* Actually fixes meteors, again

* unrelated typo fix for an admin debug verb
2017-10-29 13:13:09 +01:00
kevinz000 89b7b65efe fixes stuttering being too long 2017-10-29 00:49:27 -07:00
kevinz000 d263f11704 fixes clockcult id huds 2017-10-28 22:15:19 -07:00
YPO 097972ef79 Fixes cyborg upgrades not applying to held items 2017-10-28 23:10:03 -06:00
YPO 4e1cc0443b Fixes mech recharger integrity bar 2017-10-28 22:37:11 -06:00
ninjanomnom 3d82455c8e fixes tags and makes garbage use \ref 2017-10-28 22:38:45 -04:00
Emmett Gaines 825ab4def4 [512] The great \ref purge (#31824)
* The great \ref purge

* cleanup
2017-10-28 17:20:04 -04:00
AnturK 83e177e43c 512 experimental (#31251)
* 512 update

* Travis update

* Fixes mass replace mixup
2017-10-28 17:20:04 -04:00