Commit Graph

29201 Commits

Author SHA1 Message Date
joep van der velden
deb97eba94 Refactor2.0 the squashening 2018-09-29 13:10:16 +02:00
variableundefined
eda195fbdf Merge pull request #9488 from Kyep/blob_alert_fix
Blob fixes, including biohazard warning fix and storage blob fix #9365
2018-09-29 15:44:49 +08:00
Kyep
8f2d73194f addtimer() 2018-09-28 23:59:58 -07:00
variableundefined
352948d869 Merge pull request #9505 from Tails2091/KarmaKCleanup
Karma Cleanup
2018-09-29 09:33:24 +08:00
Tails2091
07eb540c42 Removed Returns From Switch And Added Early Return 2018-09-28 21:26:35 -04:00
variableundefined
1efbf924a5 Merge pull request #9515 from Tails2091/SLOT-CLEAM
Slotmachine "Cleanup"
2018-09-29 08:22:44 +08:00
variableundefined
68c35ccced Merge pull request #9527 from Ty-Omaha/muh-art
Fixes half the server crashing, removes canvases
2018-09-29 07:49:30 +08:00
variableundefined
ea5b252d7e Merge pull request #9635 from dapocalypse/PlasmamenGetting2PenlightsFix
Nerfs Medical Plasmemes, No extra penlights for you!
2018-09-29 07:27:14 +08:00
tigercat2000
d7202fca2e Merge pull request #9633 from farie82/Emag-Cam-Console
Fixed emagged camera consoles not opening the tabs
2018-09-28 15:14:36 -07:00
tigercat2000
20898b7551 Merge pull request #9632 from farie82/Cling-Transform
Fixes the cling transform sting problem and adds a proc for it
2018-09-28 15:13:39 -07:00
Dedhia
9e73ed4565 Nerfs Medical Plasmemes, No extra penlights for you! 2018-09-28 13:41:30 -07:00
Tails2091
8343426fe7 Removed Implied Var 2018-09-28 15:56:32 -04:00
Tails2091
05fcb11a88 Squashed Query Error Logging To Single Proc 2018-09-28 15:49:30 -04:00
joep van der velden
c99c1b83eb Fixed emagged camare consoles not opening the tabs 2018-09-28 21:38:27 +02:00
joep van der velden
27f5d66d4c Fixes the cling transform problem and adds a proc for it
I cried when I saw that the problem code not copied to another place. So
I made a proc for it.
2018-09-28 20:59:56 +02:00
Crazy Lemon
1bdf3cc38d Merge pull request #9628 from variableundefined/GearSpawn
Stop you from losing your memory and money at roundstart
2018-09-28 09:15:50 -07:00
Velden,J. van der (Joep)
7193bb4c60 Fixes the point blank shooting not working on tiles with multiple people 2018-09-28 12:51:28 +02:00
variableundefined
35342aa4cb Actually follow up with assignrank 2018-09-28 18:37:07 +08:00
variableundefined
1d368a6598 Merge pull request #9540 from SamHPurp/floodlights-are-go
Tidies up floodlights.dm & enables mappers to have round-start lights enabled
2018-09-28 16:12:34 +08:00
Crazy Lemon
4e4bb03abb Merge pull request #9620 from variableundefined/GearSpawn
Fixes latejoin AI spawning in arrivals
2018-09-28 00:10:30 -07:00
variableundefined
7daba3396c Merge pull request #9372 from Kyep/pod_fix
Fixes pod fab bug
2018-09-28 15:02:57 +08:00
variableundefined
3010b71c8d Merge pull request #9240 from nicetoolbox/megaphone-fix
Reveal identity while using megaphone
2018-09-28 12:45:21 +08:00
variableundefined
0d7a87f0d6 Merge pull request #9575 from Ty-Omaha/stupid-mice
Stops shadowlings from targeting simple animals (mice)
2018-09-28 12:39:43 +08:00
variableundefined
eac3c66a56 Merge pull request #9507 from SkeletalElite/Fluff
SkeletalElite's Fluff
2018-09-28 12:33:45 +08:00
variableundefined
38c7496755 Merge pull request #8867 from DarkPyrolord/tenbloodyyears
Fixing an old atmos error
2018-09-28 12:04:58 +08:00
nicetoolbox
fdc7297954 Reveal speaker identity when using megaphone 2018-09-27 20:36:13 -07:00
variableundefined
05e8116138 Merge pull request #9454 from shazbot194/robot_eyes
condenses eyes
2018-09-28 11:32:48 +08:00
variableundefined
55119941b8 Merge pull request #9380 from Kyep/WW_hijack
Removes hijack reward from Wild West gateway mission
2018-09-28 11:08:14 +08:00
variableundefined
cac9281d2d Merge pull request #9425 from Ty-Omaha/weewoo3
Adds a siren to the Ambulance
2018-09-28 10:54:23 +08:00
variableundefined
dec1c0c5f9 Merge pull request #9439 from alex-gh/vox_equip_fix
Vox nitrogen tanks now auto equip at spawn and almost never overwrite job items.
2018-09-28 09:28:26 +08:00
SkeletalElite
238f2db483 Requested Changes and Conflicts 2018-09-27 18:27:13 -07:00
variableundefined
fc6cbd1a9f Merge pull request #9400 from Tails2091/Hallucination-Refactor
Hallucination Refactor
2018-09-28 09:10:46 +08:00
variableundefined
40015ae533 Merge pull request #9625 from farie82/Broken-Tiles-Disposals-Fix
Fixes #5923
2018-09-28 09:01:31 +08:00
SkeletalElite
7e4774416a Requested Changes 2018-09-27 18:00:45 -07:00
Fox McCloud
c187559e83 Merge pull request #9599 from Agameofscones/lipstickcodefix
Jade lipstick color fix (and minor refactor)
2018-09-27 17:48:15 -04:00
joep van der velden
bcc9473e02 Removed unneeded code 2018-09-27 23:22:08 +02:00
joep van der velden
74fa2e38e8 Now throws the correct tile. plating is undamaged. 2018-09-27 23:21:15 +02:00
Fox McCloud
488c274f8f Merge pull request #9548 from SamHPurp/camera_assembly-refactor
Tidies up camera_assembly.dm
2018-09-27 17:20:24 -04:00
Gwydion Brain
d426ed1879 Adds comments and loadout 2018-09-27 14:17:32 -07:00
Fox McCloud
6b8b849c27 Merge pull request #9514 from variableundefined/LightFIXture
Bugfix for card & lightning
2018-09-27 17:15:38 -04:00
Fox McCloud
d265e842ca Merge pull request #9579 from variableundefined/QdelLog
Restore / add back in Qdellog / HardDelete log
2018-09-27 17:08:52 -04:00
Crazy Lemon
f87ba51d13 Merge pull request #9619 from variableundefined/BenFluffDressTake2
Benjaminfallout Fluff Item (Fixed)
2018-09-27 12:32:33 -07:00
Tails2091
42b73ad176 Replaced addtimer() with INVOKE_ASYNC() 2018-09-27 12:02:52 -04:00
variableundefined
2a41e7fdd5 Merge pull request #9312 from CornMyCob/headslug-prompt
Adds prompt for headslug
2018-09-27 22:23:44 +08:00
variableundefined
b9adf71445 Merge pull request #9550 from SamHPurp/well-defined,-some-would-say-chiseled
Updates use_power to use the Defines
2018-09-27 21:47:04 +08:00
variableundefined
8062affc68 Merge pull request #9541 from SamHPurp/blob-acts
Fixes blobs not deleting light fixtures
2018-09-27 21:30:06 +08:00
variableundefined
c969046428 Merge pull request #9522 from alex-gh/support_holopara_heal
Support holoparas can now also heal IPCs and robotic limbs.
2018-09-27 19:48:51 +08:00
variableundefined
1a7461fab7 Actually fixes conflicts! 2018-09-27 17:39:28 +08:00
tigercat2000
d07bb85151 Merge pull request #9542 from Crazylemon64/elo_fluff
E.L.O.'s fluff item
2018-09-27 01:12:32 -07:00
Crazy Lemon
91bbda1008 Merge pull request #9556 from SamHPurp/pipe-dispenser-spawns
Refactors Pipe Dispenser's cooldown
2018-09-27 00:49:40 -07:00