FalseIncarnate
|
66f10657bd
|
fix merge conflicts (again)
|
2017-11-04 17:37:30 -04:00 |
|
tigercat2000
|
7ca26db3f3
|
Merge pull request #8285 from Aurorablade/CultPasBalance
Cult Pass split: Balance shit
|
2017-10-29 11:17:39 -07:00 |
|
FalseIncarnate
|
c1e1dc22d8
|
merge conflict fix
|
2017-10-28 18:38:20 -04:00 |
|
tigercat2000
|
a5e4ccdc18
|
Merge pull request #8103 from FalseIncarnate/reagents
Silver Slime Core and Random Reagent changes
|
2017-10-27 09:23:50 -07:00 |
|
tigercat2000
|
13edd0a91d
|
Merge pull request #8288 from FreeStylaLT/paramedics_anti_theft_movement
Moves Paramedic's key from his clothes-locker to his EVA locker, removes an extraneous helmet from Paramedic's EVA locker
|
2017-10-26 15:32:53 -07:00 |
|
Crazy Lemon
|
b31110c0e8
|
Merge pull request #8270 from Kyep/ert_slots
ERT Configuration
|
2017-10-25 14:55:54 -07:00 |
|
Crazy Lemon
|
217b932606
|
Merge pull request #8220 from Anasari/BoomChickaWowWoW
Add chem reagent logging for grenade priming.
|
2017-10-25 14:31:09 -07:00 |
|
FreeStylaLT
|
9bb03159f0
|
removes the extraneous helmet
|
2017-10-25 14:29:32 +09: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 |
|
FreeStylaLT
|
a9b4170a11
|
moves the key
|
2017-10-21 14:22:41 +09:00 |
|
Aurorablade
|
f1c60a52ba
|
Balance
|
2017-10-20 18:44:59 -04:00 |
|
Kyep
|
246e039ae6
|
Splits janitor/paranormal gear based on ERT level
|
2017-10-18 17:36:02 -07:00 |
|
Kyep
|
9b7def1f87
|
Initial version
|
2017-10-17 23:44:32 -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
|
7b4ce9922f
|
Add logging for chem reagents when nade are primed
|
2017-10-10 18:52:56 +08: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 |
|
FalseIncarnate
|
693c9fde92
|
Merge from upstream master
CONFLICTS BEGONE!
|
2017-09-27 22:02:57 -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 |
|