Commit Graph

26877 Commits

Author SHA1 Message Date
Kyep
339bd23af9 Refactor, tofu-turkey=>donut, adds alcohol
Refactors to delete copypaste and avoid magic numbers.
Replaces tofu-turkey snack with a donut.
Adds several new reagents, including ice (enables iced tea & coffee,
which have the same stats as normal versions), cream (enables doctor's
delight, a -1 tox/sec fruit drink), cola & soda (enables brown star, a
fruit drink, as well as plain old cola/sodawater), and basic alcohol
reagents tequila/vodka/whiskey (which enable tequilla sunrise,
margarita, bloody mary, screwdriver, 'syndicate bomb', whiskey cola,
whiskey soda).
2017-10-25 18:34:23 -07:00
Kyep
0d65cf4d4c Adds Tofu Turkey & Burker, Chicken Soup & Newdles to RSF. 2017-10-24 16:11:37 -07:00
Kyep
f8910a881a Buffs Service Borgs 2017-10-24 02:37:43 -07:00
tigercat2000
df597ff2d0 Merge pull request #7851 from Aurorablade/EmotesAndShit
Emotes and shit
2017-10-22 12:08:02 -07:00
tigercat2000
77fb35c676 Fix spacing in mob.dm 2017-10-22 11:04:43 -07:00
tigercat2000
767634e7ac Merge pull request #7615 from Crazylemon64/no_suicide_clone
No more cloning suiciders
2017-10-22 10:48:30 -07:00
Crazy Lemon
f0607410f9 Merge pull request #7268 from Allfd/syndiboots
Give nukeops magboots
2017-10-22 10:22:16 -07:00
Crazy Lemon
fcd3ea3194 Merge pull request #8241 from Allfd/fastest-linda
Fastest linda
2017-10-22 10:18:52 -07: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
Aurorablade
b5c0d7d58d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EmotesAndShit 2017-10-15 21:15:01 -04:00
Aurorablade
8df384e45f Spin emote removal..
..But keeps the proc! CUASE ITS CLEAN!
2017-10-15 20:07:23 -04:00
tigercat2000
57eba20480 Merge pull request #8198 from imsxz/mechs-are-kinda-op
Mech ballistics now must all re-arm
2017-10-15 16:06:54 -07:00
tigercat2000
f0c35da099 Merge pull request #8175 from TullyBurnalot/ShadowlingHealEyes
Shadowling Passive Healing now heals eye damage
2017-10-15 16:01:18 -07:00
tigercat2000
202113870b Merge pull request #8177 from TullyBurnalot/ShadownerdFLAMES
Plasmamen Shadowlings no longer burn to death
2017-10-15 15:55:25 -07: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
a0c3b893fe Fixes Travis 2017-10-15 23:03:43 +01:00
Citinited
be97382c26 Tigercat & Fox tweaks 2017-10-15 23:03:28 +01:00
Citinited
d485bd8d41 Fixes a random runtime when pipes are unwrenched 2017-10-15 23:03:20 +01:00
Citinited
2881fad0a3 Radiation mines no longer affect species with RADIMMUNE or NO_DNA flags 2017-10-15 23:03:16 +01:00
Citinited
353ceb0693 Throwing items through shocked airlocks will no longer cause the airlock to spark 2017-10-15 23:02:58 +01:00
Citinited
cd5ba823f2 Shuttles will now only close airlocks when moving 2017-10-15 23:02:58 +01:00
Citinited
5f41e337fd Firedoors can't be welded while open and can't open if they're welded 2017-10-15 23:02:58 +01:00
Citinited
6d5560afbd Full-sized plasma windows are now fire-resistant; full-sized reinforced plasma windows are now fireproof 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
FlattestGuitar
948a65b2a3 more tigerfixes 2017-10-15 23:40:38 +02: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
da8cd65b01 Merge pull request #8161 from uraniummeltdown/kvlt
Restricted Cult Summon Areas
2017-10-15 13:47:27 -07:00
Alffd
7b67eec6f0 Fastest linda 2017-10-14 23:38:39 -04: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
d9e60ab4d8 Merge pull request #8239 from Anasari/WITNESSME
Fix explosive lance embedding
2017-10-14 11:31:25 -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
tigercat2000
daaabb4bf4 Merge pull request #8224 from Kyep/jobslot_log
Changing job slots notifies admins
2017-10-14 10:43:51 -07:00
Ansari
fa3f1ba819 actually make it unembeddable 2017-10-14 13:53:57 +08:00
Ansari
00feecc110 Damnit Imsxz 2017-10-14 13:38:41 +08:00
Aurorablade
eb6166a429 Adds vore 2017-10-12 23:09:02 -04:00
uraniummeltdown
f895519178 added a 0 2017-10-12 19:24:18 +05:00
uraniummeltdown
8964179dba Merge branch 'master' into kvlt 2017-10-12 15:15:15 +05:00
Aurorablade
76453d0ca8 EVERYTHING IS PERFECTLY FINE 2017-10-11 23:50:24 -04:00
Kyep
4f565ae173 Changing job slots notifies admins
🆑 Kyep
tweak: HoPs/Captains opening/closing job slots is now announced to
admins. No more HoPs opening 30 clown slots without admins noticing.
/🆑
2017-10-11 16:52:37 -07: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