Commit Graph

29253 Commits

Author SHA1 Message Date
variableundefined d359d6bbcb Cache verbs 2018-10-08 11:00:56 +08:00
variableundefined 721a7656d2 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into NPCPoolPort 2018-10-01 16:34:47 +08:00
Crazy Lemon e3e22ca2ab Merge pull request #9476 from variableundefined/SSNanoMob
Port Nano Mob to StonedMC
2018-10-01 01:13:58 -07:00
Crazy Lemon ca26739109 Merge pull request #9477 from variableundefined/SSPortShuttle
Port Shuttle to StonedMC
2018-10-01 01:13:42 -07:00
variableundefined 15c03263cc Merge pull request #9660 from TDSSS/minor-spelling-fix
Minor spelling fix
2018-10-01 15:50:42 +08:00
Crazy Lemon fb7db0aef1 Merge pull request #9409 from Aurorablade/FlagBearerFluff
Fluff TheFlagbearer: Arachno-Man boots and sprite updates
2018-10-01 00:47:42 -07:00
TDSSS 1a3d838ba4 More minor fixes 2018-10-01 09:22:33 +02:00
TDSSS 9aeabeff7e Minor spelling fix 2018-10-01 09:13:47 +02:00
variableundefined 363aef2ef7 Merge pull request #9647 from TDSSS/RnDfix
Fixes RnD server control console data management
2018-10-01 08:35:43 +08:00
variableundefined 91103ef5d8 Merge pull request #9649 from SamHPurp/get_area-speed
Speeds up get_area
2018-10-01 08:28:56 +08:00
variableundefined d30576fbb9 Merge pull request #9651 from SamHPurp/area-master-bye-bye
Removes get_area_master - left over junk
2018-10-01 08:22:49 +08:00
Dedhia ec3d7379f0 Adds Grille Cooldown 2018-09-30 16:42:22 -07:00
tigercat2000 7ca1e19a72 Merge pull request #9650 from TDSSS/water-fix
Makes water tiles unremovable with a crowbar
2018-09-30 11:24:17 -07:00
Crazy Lemon 5aa7ec351b Merge pull request #9648 from TDSSS/plasma-statue-fix
Laser tag guns can no longer set off plasma statues, fixes #7234
2018-09-30 10:21:30 -07:00
Purpose 29c0734905 get area master does nothing! 2018-09-30 17:28:47 +01:00
Purpose a4f5e45c39 delicious nanoseconds 2018-09-30 16:21:47 +01:00
TDSSS 2c37c35871 Makes water tiles unremovable with a crowbar 2018-09-30 17:20:51 +02:00
TDSSS 8c8cc6bb0c Makes lasertag guns also not ignite plasma walls, to make things more
consistent.
2018-09-30 16:48:55 +02:00
TDSSS 0ad8a2b2de Makes weapons that deal no damage unable to ignite plasma statues 2018-09-30 16:44:00 +02:00
TDSSS f16168aa06 Fixed data management screen, research deletion. 2018-09-30 15:13:05 +02:00
TDSSS 13923d0c79 Fixes typo 2018-09-30 13:45:29 +02:00
variableundefined 06a2daf73a Merge pull request #9467 from shazbot194/KA_fix
Lets you remove KA mods from borgs
2018-09-30 18:22:59 +08:00
Crazy Lemon 6e25d62c69 Minor correction of the interpretation of my code 2018-09-30 02:35:55 -07:00
tigercat2000 c30fef32d0 Merge pull request #9644 from Crazylemon64/ipc_comment_fix
Corrects the comment for IPC damage
2018-09-30 02:19:58 -07:00
shazbot194 ac9530862c Update to code
more module now
2018-09-29 22:10:33 -08:00
Aurorablade 4973f0d7f2 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into FlagBearerFluff 2018-09-29 23:30:04 -04:00
Crazylemon64 27103c4f2b Corrects the comment for IPC damage
Now the comment reflects the actual numbers
2018-09-29 20:11:18 -07:00
Crazy Lemon fb5247b045 Merge pull request #9413 from Ty-Omaha/button
Adds a Discord button & stylizes the Karma Shop and Donate buttons
2018-09-29 17:48:48 -07:00
variableundefined 3f3194598d Merge pull request #9642 from SamHPurp/span-span-span-span
Fixes a bunch of message formatting overflows
2018-09-30 08:30:49 +08:00
Crazy Lemon 58823627f0 Merge pull request #9639 from variableundefined/OneClickFix
Finally fixes one click antagonist giving antag to the wrong people
2018-09-29 17:23:13 -07:00
Fox McCloud 35ce5aeb19 Merge pull request #9412 from datlo/librarianpoisonpen
Adds the poison pen to the Librarian syndicate items
2018-09-29 20:09:23 -04:00
tigercat2000 282a19dee2 Merge pull request #9629 from DarkPyrolord/deepfreezefluff
Pyro's Fluff: Winterised Hardsuit
2018-09-29 11:42:36 -07:00
Purpose 6cb07cb70c Fixes a bunch of shown messages 2018-09-29 19:10:10 +01:00
variableundefined f67fabd082 I am a genius 2018-09-29 21:37:15 +08:00
variableundefined f39af3061a Merge pull request #9638 from farie82/Airlock-refactor
Refactor the airlock.DM and changed a smoll inconsistency
2018-09-29 19:41:19 +08:00
joep van der velden deb97eba94 Refactor2.0 the squashening 2018-09-29 13:10:16 +02:00
variableundefined 7a1790f493 Merge pull request #9637 from Agameofscones/nukeop_biotics
Fix of #8056
2018-09-29 18:42:06 +08: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
Gwydion Brain 855a41a080 Initial Proc Addition 2018-09-28 20:53:21 -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
DarkPyrolord 2eeccc0c48 TigerFixes 2018-09-29 13:10:01 +12: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