Commit Graph

6741 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
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
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
2881fad0a3 Radiation mines no longer affect species with RADIMMUNE or NO_DNA flags 2017-10-15 23:03:16 +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
tigercat2000
5e7a9a6470 Merge pull request #7904 from FlattestGuitar/guardian-memes
Holoparasites. Take two.
2017-10-15 14:48:20 -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
Alffd
7b67eec6f0 Fastest linda 2017-10-14 23:38:39 -04: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
Fox McCloud
3ca149e8d3 Merge pull request #8215 from Kyep/mindslave_fix
handles antagbanned players who get mindslaved
2017-10-11 18:00:43 -04:00
Fox McCloud
3ab149985d Merge pull request #8179 from TullyBurnalot/CrateFeex
Garbage Cans are now functional
2017-10-11 17:37:36 -04:00
TullyBurnalot
bb3415187a Identation Feex 2017-10-11 22:27:47 +01:00
TullyBurnalot
90fc6b4de2 Garbage Cans inherit full properties from crates 2017-10-10 16:30:08 +01:00
Ansari
08eefa937b Changed to /I instead of /W. Idk how to codespeech 2017-10-10 14:43:29 +08:00
Ansari
2dbd3d4e66 Let any item smash windows instead of just weapons. 2017-10-10 14:18:07 +08:00
Kyep
65d4719835 stops antagbanned players being mindslaved
squash
2017-10-09 21:46:38 -07:00
Aurorablade
73b0f32927 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DreamFluff 2017-10-07 22:46:57 -04:00
tigercat2000
adbb2a9c06 Merge pull request #8168 from scrubmcnoob/Abductor-Megaphone-FIx
Abductor Megaphone Fix
2017-10-07 11:25:04 -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
988939aa37 Merge pull request #8169 from uraniummeltdown/whetstone
New Cult Whetstone Sprite
2017-10-07 10:31:26 -07:00
Ansari
ed64971e8a Nerf slime cell charge rate to 500, from 1500 2017-10-03 20:42:21 +08:00
TullyBurnalot
39be6a372d Removed needless "\the"s 2017-10-02 15:28:27 +01:00
TullyBurnalot
e7c5148e57 Garbage Cans are now functional 2017-10-01 23:16:38 +01:00
uraniummeltdown
5300b90496 change whetstone notice spans to warning 2017-09-30 22:51:19 +04:00
uraniummeltdown
c067dcf385 new cult whetstone sprite 2017-09-30 22:48:18 +04:00
scrubmcnoob
ec6f2f52fc Megaphone FIx
Fixed
2017-09-30 14:43:31 -04:00
uraniummeltdown
6b93bf0d1f adds obj sprite, back sprite and inhands for air tanks 2017-09-30 10:05:56 +04:00
Jovaniph
c428edf39e Merge Conflict thingy 2017-09-29 19:09:01 -04:00
Fox McCloud
e8ab1697ad Merge pull request #8127 from uraniummeltdown/biodegrade
Changeling Biodegrade Power, Fixes Hivemind Link
2017-09-28 20:14:17 -04:00
Mars
2fae0f1739 isrobot check 2017-09-28 12:15:52 +02:00
uraniummeltdown
bbe4c341f8 Merge branch 'master' into biodegrade
# Conflicts:
#	paradise.dme
2017-09-28 13:35:30 +04:00
tigercat2000
0e44384945 Merge pull request #7465 from Fox-McCloud/peacekeeper-borgs
Adds Peacekeeper borgs; Retains Secborgs
2017-09-27 17:23:16 -07:00
Fox-McCloud
9c3d0a9f8a bleh 2017-09-27 20:06:19 -04:00
Fox-McCloud
e1ce6fac3b oops 2017-09-27 19:21:25 -04:00
Fox-McCloud
70d79e38f1 fixes 2017-09-27 16:01:48 -04:00
tigercat2000
00d79fd2de Merge pull request #8138 from uraniummeltdown/rpd
Adds the RPD to hacked Autolathes, Drones and Engineering Cyborgs
2017-09-27 11:03:54 -07:00
Birdtalon
9008505997 crates will now forcemove mobs inside when opened 2017-09-27 15:36:47 +01:00
uraniummeltdown
fe9fba469b adds the RPD to autolathe and engiborgs, adjusted RPD materials to match the expensive autolathe price 2017-09-25 19:43:54 +04:00
tigercat2000
5ba25fab72 Merge pull request #8093 from Birdtalon/roboticists
Small robotics layout change.
2017-09-24 18:40:52 -07:00
tigercat2000
4f452b2eae Merge pull request #8023 from Birdtalon/defibrilator-shortcut
Control Click shortcut for defibrillator toggle paddles verb
2017-09-24 13:16:50 -07:00
Mars
6f736f4254 Wound, not would 2017-09-24 17:37:15 +02:00
uraniummeltdown
caa41d5640 add changeling biodegrade power, move closet/crate/locker broken and locked vars up, re-add hivemind link to the dme 2017-09-23 19:04:22 +04:00
Jovaniph
cd7b49f770 remove comments 2017-09-20 00:14:50 -04:00
Crazy Lemon
3eaff16f45 Merge pull request #7790 from tigercat2000/vv_improved
VV Refactor & Upgrade
2017-09-17 15:13:04 -07:00
Jovaniph
119d87e56f Removed Sprite / Change locker to wardrobe / Put Dropper and Forma on Table. 2017-09-16 16:44:34 -04:00