cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-05-28 09:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
35,916 Commits 14 Branches 2 Tags
7a7dcf29c994d8dad89f7bc4e7e527ea53e9a1df
Commit Graph

16631 Commits

Author SHA1 Message Date
Ralta 7a7dcf29c9 Adds Blueshield Beret to Ian clothing 
Allows Ian to wear the Officer's Beret and the Navy Blue Officer's Beret in order to become Blueshield Ian, protector of Command and biter of ankles.
 2019-02-20 23:16:01 +00:00
tigercat2000 b141323e08 Merge pull request #7800 from Citinited/clipboard-improvements 
Makes clipboard code less horrible
 2017-10-15 19:40:57 -07:00
tigercat2000 6f0167b777 Merge pull request #7735 from Citinited/miscellaneous-fixes 
In which I fix a bunch of issues and tweak some other things
 2017-10-15 19:40:46 -07:00
Citinited acc6aaa73a Tigercat formatting changes 2017-10-16 03:29:22 +01:00
Aurorablade 0aaaf3a11c THESE WOUNDS THEY WILL NOT HEAL 2017-10-15 22:26:34 -04:00
TDSSS 1e7575afde Adjusted ghetto surgery tool chances to keep ghetto surgery chances overall roughly equal. Also added rigsuit removal to list of surgeries that don't care about pain. 2017-10-15 15:28:25 -07:00
TDSSS 897e201775 Started on surgery stuff 
Adds pain modifier to surgery if patient is conscious

Now actually compiles

Makes surgery easier if patient is drunk, allowing for easier ghetto surgery.

Now reduces failure chance if painkillers are in the patient's system.

Fixed argument spacing (hopefully)

Repairing robotic limbs no longer needs anesthesia.

Revert "Repairing robotic limbs no longer needs anesthesia."

This reverts commit 12c1f4140a.

Repairing robotic limbs doesn't cause a pain modifier, because they don't feel pain. Now actually works.

Moves typecasting from the helper proc to outside fo it and checks for sleeping.

Now correctly checks for repair to robotic limbs.

Increased effectiveness of Hydrocodone and Morphine to 99% on maintainer recommendation.
 2017-10-15 15:28:13 -07:00
Citinited 73d8c564fc tigercat formatting changes 2017-10-15 23:15:28 +01:00
Citinited be97382c26 Tigercat & Fox tweaks 2017-10-15 23:03:28 +01:00
Citinited cd5ba823f2 Shuttles will now only close airlocks when moving 2017-10-15 23:02:58 +01:00
Citinited c3a31fe015 You can now remove facehuggers from corgis 2017-10-15 23:02:58 +01:00
tigercat2000 5e7a9a6470 Merge pull request #7904 from FlattestGuitar/guardian-memes 
Holoparasites. Take two.
 2017-10-15 14:48:20 -07:00
tigercat2000 fd02035b47 Merge pull request #8044 from Kyep/sec_status_execute 
Adds 'Execute' status, sec status change logging
 2017-10-15 14:42:48 -07:00
tigercat2000 b316f484e6 Merge pull request #7609 from Vivalas/splint_nerf 
Makes surgery great again (nerfs splints)
 2017-10-15 14:00:17 -07:00
tigercat2000 b8d6051c66 Merge pull request #7482 from Aurorablade/DreamFluff 
Phantasmic Dream Fluff:Zekes Tendrils
 2017-10-15 13:53:02 -07:00
tigercat2000 eab8492d2d Merge pull request #8201 from MarsM0nd/Mangling_Black 
Black gloves mangling
 2017-10-14 11:54:42 -07:00
tigercat2000 8a5bf84e7b Merge pull request #8213 from Aurorablade/HAILATMOSIA 
Adds Armbands to loadout
 2017-10-14 11:36:45 -07:00
tigercat2000 32a81900b4 Merge pull request #8219 from Anasari/Portal3Blows 
Portal beam don't detonate tank anymore
 2017-10-14 10:55:33 -07:00
Aurorablade 76453d0ca8 EVERYTHING IS PERFECTLY FINE 2017-10-11 23:50:24 -04:00
Fox McCloud d58ae99778 Merge pull request #8210 from Birdtalon/spooders 
Terror spiders respect antag HUD
 2017-10-11 18:15:57 -04:00
Birdtalon 349edceb86 fix 2017-10-11 23:10:27 +01:00
Fox McCloud 3be9e3d35f Merge pull request #8164 from uraniummeltdown/pacman 
Better Portable Generator Sprites
 2017-10-11 17:34:32 -04:00
Fox McCloud 84aca8f1b5 Merge pull request #8181 from Anasari/IDiedForSecBorgsSin 
Increase energy cost of cyborg's laser & disabler
 2017-10-11 17:30:38 -04:00
Fox McCloud 30fa3dc5a1 Merge pull request #8216 from Anasari/BattleWagonTakeTwo 
pAI mulebot cannot knock people down anymore.
 2017-10-11 17:18:19 -04:00
Ansari 28de2ec80c Change to a proper boolean 2017-10-10 17:44:32 +08:00
Ansari 29270c1d23 Portal beam no blows. No damage 2017-10-10 17:18:40 +08:00
Ansari 86a58588b9 pAI mulebot cannot knock people down anymore. 2017-10-10 12:46:31 +08:00
Aurorablade f4f82a6825 Armbands 2017-10-09 20:42:28 -04:00
Birdtalon a7ef90d13b Terror spiders respect antag HUD 2017-10-09 19:28:11 +01:00
Aurorablade 53d63a29f8 i thought i commited this... 2017-10-08 18:37:34 -04:00
Birdtalon 124bd9a98d adds check for null beegent 2017-10-08 18:37:53 +01:00
Mars 4451354398 Makes cutting off fingertips optional 2017-10-08 17:26:10 +02:00
Aurorablade 73b0f32927 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DreamFluff 2017-10-07 22:46:57 -04:00
Aurorablade 70b6a717ab This then conflicts 2017-10-07 22:21:15 -04:00
tigercat2000 bcb18d3ba6 Merge pull request #8167 from uraniummeltdown/ammo 
10mm Alt Magazine Sprites
 2017-10-07 11:26:34 -07:00
tigercat2000 5737279bf3 Merge pull request #8098 from Birdtalon/bee-careful 
Prevents bees form synthesising forbidden reagents
 2017-10-07 11:07:42 -07:00
tigercat2000 9961d2a602 Merge pull request #8148 from scrubmcnoob/Syndie-Borg-Fix 
Syndie Borg fix
 2017-10-07 11:04:06 -07:00
tigercat2000 b3113cad7d Merge pull request #8102 from Aurorablade/OOCinICinOOC 
Admin Event Info
 2017-10-07 11:00:46 -07:00
tigercat2000 8e6240b13b Merge pull request #8190 from Anasari/NerfMiniSquishFlowToday 
Nerf yellow slime cell & Buff ion thruster
 2017-10-07 10:56:58 -07:00
tigercat2000 b974195d59 Merge pull request #8191 from imsxz/ready-for-xeno-salt 
More consistent alien spawning
 2017-10-07 10:01:22 -07:00
Birdtalon 3c57ec436f fixes bottler 2017-10-05 20:00:38 +01:00
imsxz f9cbd65ffd Xeno spawn consistency 2017-10-03 13:03:42 -04:00
Ansari 91aa40e1ff Reduce ion thruster's energy use by half from 100 -> 50 2017-10-03 21:03:11 +08:00
Ansari 51dceab69c Change the e-cost on both gun to 250 2017-10-03 16:39:04 +08:00
Ansari db8ecd2e6e Add two ammo_casing. Increase energy cost to 300. 2017-10-02 18:11:04 +08:00
tigercat2000 5a9c425932 Fix custom synthetic invisibility exploit 
The proper way. This ensures that a given sprite actually exists before
offering you the option to use that sprite.
 2017-09-30 15:24:56 -07:00
uraniummeltdown f8cfa51b21 10mm alt magazines have their own sprites 2017-09-30 22:22:11 +04:00
uraniummeltdown bca9b79374 new pacman portable generator sprites 2017-09-30 12:15:11 +04:00
Fox McCloud cb70e28e65 Merge pull request #8146 from Landerlow/Lesspain 
Adds hydrocodone to medical borg hypospray
 2017-09-30 03:52:33 -04:00
Aurorablade 80bda70383 i am stupid 2017-09-29 23:57:19 -04:00