Commit Graph

18068 Commits

Author SHA1 Message Date
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
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
Dedhia
9e73ed4565 Nerfs Medical Plasmemes, No extra penlights for you! 2018-09-28 13:41:30 -07:00
Tails2091
05fcb11a88 Squashed Query Error Logging To Single Proc 2018-09-28 15:49:30 -04: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
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
eac3c66a56 Merge pull request #9507 from SkeletalElite/Fluff
SkeletalElite's Fluff
2018-09-28 12:33:45 +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
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
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
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
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
0dd1c2522f Merge pull request #9621 from variableundefined/NerfPlasmaMan
Avert plasmaman taking over Paradise with double firepower
2018-09-26 22:02:20 -07:00
Crazy Lemon
9f31ac09e3 Merge pull request #9591 from Birdtalon/beepers
Beepsky responds to disarming
2018-09-26 21:09:52 -07:00
variableundefined
7b64b99e21 No double gun anymore! 2018-09-27 11:52:22 +08:00
variableundefined
1d1b0daaa0 Fixes gearspawning for good 2018-09-27 11:40:39 +08:00
Crazy Lemon
084866c5ba Merge pull request #9557 from SamHPurp/spawn-in-hunter-tackles
Refactors Xeno Hunter tackle spawn
2018-09-26 17:34:04 -07:00
Crazy Lemon
904061637c Merge pull request #9555 from SamHPurp/kills-sleeps/spawns
Removes Sleeps/Spawns from Malf AI modules
2018-09-26 17:33:32 -07:00
Crazy Lemon
4991d152af Merge pull request #8811 from FalseIncarnate/kitchen
Mixing Bowls and Kitchen refactors
2018-09-26 17:32:39 -07:00
Crazy Lemon
ad283ae489 Merge pull request #9586 from SamHPurp/synthetic-capitalisation
Synthetic grammar fix
2018-09-26 17:25:24 -07:00
Crazy Lemon
dc1cbdfd93 Merge pull request #9600 from variableundefined/GearSpawn
Fixes gear disappearing on lobby screen
2018-09-26 17:02:31 -07:00
Crazy Lemon
85576d04e3 Merge pull request #9587 from SamHPurp/nt-formal-fixes
Code improvement & Spelling fix on NT Formal Gear
2018-09-26 17:01:15 -07:00
Crazy Lemon
f863b792bd Merge pull request #9601 from variableundefined/DropLocation
Adds in drop_location & AllowDrop()
2018-09-26 17:00:11 -07:00
Crazy Lemon
26a20f5f8a Merge pull request #9593 from Birdtalon/borgactions
Borg modules now respect actions
2018-09-26 16:50:17 -07:00
Crazy Lemon
908783c571 Merge pull request #9598 from DesolateG/adverbADVERB
Fixes #9561
2018-09-26 16:29:45 -07:00
Crazy Lemon
d3505ea9b9 Merge pull request #9543 from nicetoolbox/changeling-grab-fix
Fix changeling tentacle grab
2018-09-26 16:25:25 -07:00
Crazy Lemon
5c5a0b357c Merge pull request #9534 from DesolateG/reapwhatyousoy
Fixes #9532
2018-09-26 16:24:07 -07:00
Crazy Lemon
80d8017e0f Merge pull request #9610 from dapocalypse/BugFixes
Bug Fixes
2018-09-24 21:02:46 -07:00