cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-25 01:31:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,325 Commits 26 Branches 2 Tags
4d17f14de0e3aea727a006bcccd6f5a5e74ccbc3
Commit Graph

18342 Commits

Author SHA1 Message Date
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
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
variableundefined
8b09bfedad Allow you to slice cheesewheel with any sharp item 2018-09-30 08:03:09 +08:00
joep van der velden
4cf95b9958 PANDEMIC print stuf. Yiz 2018-09-29 22:59:05 +02:00
Birdtalon
c72561d194 addresses points in Purpose's review. Fixes some spans, replaces some 0,1 with TRUE,FALSE, uses some defines 2018-09-29 20:29:26 +01: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
Purpose
c82cd93a89 Merge branch 'master' into Refactors-beds-stools-chairs 2018-09-29 15:36:27 +01:00
variableundefined
f67fabd082 I am a genius 2018-09-29 21:37:15 +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
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
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
Birdtalon
af045a58ef fixes 2018-09-28 19:33:50 +01:00
Birdtalon
deec79982e adds paranormal loadouts, alters ERT survival kit box, updates PDW 9 sprite, adds paranormal armour variants. 2018-09-28 19:22:55 +01: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
DarkPyrolord
c04f3b7f74 NameFix 2018-09-28 22:54:06 +12: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
DarkPyrolord
dd9cbb861d WinterSec 2018-09-28 22:42:38 +12: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
Desolate
7d78fe93bf Refactors some reagent lists into global list 
Fixes an oversight with fly amanita from the BAYBOTANY to TGBOTANY change.
 2018-09-27 20:44:25 -05: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