Commit Graph

14225 Commits

Author SHA1 Message Date
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
Fox McCloud
600865d026 Merge pull request #8166 from scrubmcnoob/Cult-Teleportation-Fix
Cult Teleport Fix
2017-10-11 17:21:50 -04: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
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
f696237b93 Merge pull request #8154 from Birdtalon/brigdoors
Brig Cell timers QoL changes.
2017-10-07 10:45:57 -07:00
tigercat2000
988939aa37 Merge pull request #8169 from uraniummeltdown/whetstone
New Cult Whetstone Sprite
2017-10-07 10:31:26 -07:00
tigercat2000
a4445c5e10 Merge pull request #8163 from uraniummeltdown/air
Sprites For Air Tanks
2017-10-07 10:19:12 -07:00
scrubmcnoob
35588f3810 change
fox change
2017-10-05 19:10:43 -04: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
Ansari
d9a7540007 Change slot machine's paying chance 2017-10-02 19:18:28 +08:00
Fox McCloud
39d51ddf80 Merge pull request #8173 from imsxz/no-vamp-enthralling-chaplains
Fixes vampires enthralling the chaplain
2017-10-02 03:16:03 -04:00
Fox McCloud
8ab1a44ad4 Merge pull request #8176 from imsxz/I've-never-seen-this-spell-used
Fixes shadowling rapid re-hatch
2017-10-02 03:09:34 -04:00
TullyBurnalot
e7c5148e57 Garbage Cans are now functional 2017-10-01 23:16:38 +01:00
imsxz
8c289a4cf7 Fixes shadowling rapid rehatch 2017-10-01 14:08:18 -04:00
imsxz
e5429ee259 Fixes holy vampire thralls 2017-10-01 01:51:40 -04: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
scrubmcnoob
c94bd15543 remove redundant
fix
2017-09-30 13:45:22 -04:00
scrubmcnoob
ef2609100d Cult fix
Cult fix
2017-09-30 13:37:36 -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
cd99eb362e Merge pull request #7706 from Citinited/entertainment-monitor-fix
Camera console tweaks
2017-09-29 15:51:45 -04:00
Birdtalon
9448403102 removes duplicate "seconds" 2017-09-29 08:39:56 +01: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
9d3bc5b400 forcemove 2017-09-28 13:36:54 +04: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
Birdtalon
2d0ee4c7ae changes Set Timer to Input Time" 2017-09-28 00:06:04 +01:00
Birdtalon
0ca5492cef replaces increment controls with an input box, uses seconds_to_time to return clearer brig times 2017-09-27 23:59:51 +01:00
Fox-McCloud
70d79e38f1 fixes 2017-09-27 16:01:48 -04:00
Fox McCloud
327108805d Merge pull request #8137 from uraniummeltdown/ling
Some Ling Changes
2017-09-27 14:37: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
96c9e836c2 fleshmend restores 30 blood volume 2017-09-26 07:51:48 +04: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
uraniummeltdown
1503dee51e ling regen stasis time from 80s to 40s, armblade door open time from 15s to 10s, lings always keep regen stasis even when readapting, added mannitol and antihol to panacea, fleshmend chem cost from 25 to 20 and it no longer restores blood and spamming it in a short time gives less effective healing, spawn->addtimer in fakedeath.dm, lings can generate chems when dead up to half the max (37.5), added chameleon skin power for 2 evo points 2017-09-25 19:15:22 +04:00
tigercat2000
5ba25fab72 Merge pull request #8093 from Birdtalon/roboticists
Small robotics layout change.
2017-09-24 18:40:52 -07:00
tigercat2000
855de4a7ca Merge pull request #8037 from Crazylemon64/cryopod_emag_objectives
Cryopods eject objective items upon emag
2017-09-24 18:32:49 -07:00
Fox McCloud
c6f8907d96 Merge pull request #8125 from uraniummeltdown/bolatech
Lowers Mech Bola Launcher Combat Tech
2017-09-24 21:19:54 -04:00