Markolie
bb0bbdcf5a
Alien claws fix
2015-10-01 04:27:59 +02:00
Markolie
d18b18b5b4
Syndicate borg update, add medical syndicate borg, energy sword refactor
2015-10-01 04:21:24 +02:00
Fox McCloud
f000c0c225
Merge pull request #2238 from Markolie/emotes
...
Add cooldown to chirp emote, dsay fix
2015-09-29 22:37:31 -04:00
Mark van Alphen
f10fd6e1ee
Merge pull request #2212 from Spacemanspark/master
...
Makes *deathgasp less snowflakey
2015-09-30 04:30:53 +02:00
Markolie
1a7c565482
Fix
2015-09-30 03:38:44 +02:00
Markolie
9277a2f55e
Dsay fix
2015-09-30 03:35:30 +02:00
Markolie
8d99c8c689
Add cooldown to chirp emote
2015-09-30 03:04:15 +02:00
Mark van Alphen
b164da999a
Merge pull request #2234 from tigercat2000/RIP_in_piss
...
Remove unused ZAS files. Rest in piss, ZAS.
2015-09-30 02:52:22 +02:00
TheDZD
d84868d43f
Merge pull request #2229 from Markolie/hotkey
...
Admin PM fix
2015-09-29 20:25:56 -04:00
Tigercat2000
aff2ab6cd9
Remove unused ZAS files. Rest in piss, ZAS.
2015-09-29 17:16:59 -07:00
Mark van Alphen
d3c3459a0f
Merge pull request #2227 from Crazylemon64/stickier_beakers
...
Fix Beaker Fix so Robots can Wire Machines Again
2015-09-30 01:45:03 +02:00
Fox McCloud
15c9873cdf
Merge pull request #2224 from Markolie/shitcode
...
Strange reagent fix, tod --> timeofdeath
2015-09-29 18:25:04 -04:00
Markolie
f7c2685122
Admin PM fix
2015-09-30 00:21:55 +02:00
Markolie
2712c4dba8
Add spaceport security to blacklist
2015-09-29 23:18:05 +02:00
Crazylemon
13b97712a2
Stacks can now be added to machines again just fine
...
Also took out the unnecessary "You can't add this to the machine!"
message when using a screwdriver on frames
2015-09-29 14:15:47 -07:00
Markolie
8b2e62fc10
Strange reagent fix, tod --> timeofdeath
2015-09-29 22:03:04 +02:00
Mark van Alphen
bee80d49cb
Merge pull request #2211 from Crazylemon64/stickier_beakers
...
Stickier cyborg beakers
2015-09-29 21:55:48 +02:00
Mark van Alphen
603a77bc3d
Merge pull request #2218 from Fox-McCloud/safe-cleanup
...
Safe Cleanup and Fix
2015-09-29 21:55:07 +02:00
Crazylemon
734e0842e2
Fixed a few more reversed add_logs
...
Did a search, and found 3 of these to patch up. Perhaps there's
something left, perhaps not.
2015-09-29 11:56:51 -07:00
Crazylemon
9678fe09ec
Replaced location setting with forceMove()
...
I'm restricting this only to the machine's I'm affecting with this fix.
Refactoring the rest of the code to use it would be for a different
thing.
2015-09-29 11:09:38 -07:00
Mark van Alphen
25f19dff0d
Merge pull request #2204 from Fox-McCloud/belt-of-holding
...
Ports NT Station's Belt of Holding Sprite
2015-09-29 18:47:17 +02:00
Fox-McCloud
18a340085c
Merge pull request #2219 from tigercat2000/tuhtuh
...
Fix exploit, refactor access to body color,
2015-09-29 12:21:25 -04:00
Tigercat2000
3c80bd7eb1
Fix exploit, refactor access to body color,
...
let IPC's actually change color as non-admins
2015-09-29 08:52:20 -07:00
Fox-McCloud
7586390436
Merge pull request #2146 from TheDZD/vision
...
Shadowling, Changeling, and Vision Fixes/Changes
2015-09-29 11:44:06 -04:00
Fox-McCloud
62fb3c2981
Safe Cleanup and Fix
2015-09-29 11:31:57 -04:00
DZD
22faa3c40d
Fixes a few description oversights
2015-09-28 19:28:48 -04:00
TheDZD
6705006ee7
Merge pull request #2213 from Fox-McCloud/destroy-fixes
...
Fixes a few Destroys
2015-09-28 19:28:29 -04:00
TheDZD
19d8aa3d36
Merge pull request #2215 from Markolie/s2
...
Fix flamethrower logs
2015-09-28 19:03:45 -04:00
DZD
b990b6c71b
Merge remote-tracking branch 'upstream/master' into vision
2015-09-28 19:03:14 -04:00
Markolie
6825c33cb9
Fix flamethrower logs
2015-09-29 00:51:17 +02:00
Spacemanspark
34b1a3a52f
Adds the death message to monkeys again. Oops.
2015-09-28 17:40:24 -05:00
Fox-McCloud
be672419ca
Fixes a few Destroys
2015-09-28 18:15:39 -04:00
Spacemanspark
197f0b7219
makes *deathgasp less snowflakey
2015-09-28 16:58:28 -05:00
Spacemanspark
624b7cbc71
Gives IPC's a unique death message in a less snowflakey manner.
2015-09-28 16:57:16 -05:00
Spacemanspark
a02d843153
De-snowflakes *deathgasp
2015-09-28 16:55:04 -05:00
Crazylemon
a1636b3b24
NODROP is now more respected
...
A few machines, especially in medical, didn't respect NODROP. Hopefully
with these changes, medical cyborgs should no longer get their beaker
stuck in some sort of bizarre multipositional limbo.
2015-09-28 14:48:06 -07:00
Fox-McCloud
3ec20a2313
Merge pull request #2208 from Markolie/fixes3
...
Fixes
2015-09-28 16:32:11 -04:00
Tigercat2000
ec2b31e435
Nuke wheelchair snowflake shit, fix the delay
2015-09-28 12:59:44 -07:00
Markolie
8e37513502
Make sure all departments can still sync with R&D
2015-09-28 20:39:30 +02:00
Crazylemon
7c6475895c
Beakers now follow a drop check before being put in the sleeper
...
Cyborgs no longer will be able to do weird things with their nodrop
beakers in the sleeper. This might need some sort of replacement for
this functionality, but this seems hardly functional as it is.
2015-09-28 11:26:02 -07:00
Markolie
2f148fd429
Cell update
2015-09-28 19:04:22 +02:00
Markolie
7678f601bc
Attack animation
2015-09-28 18:47:29 +02:00
Markolie
52b700f8c8
Proper sprite/sounds for electric arm
2015-09-28 18:45:57 +02:00
Markolie
2c7d6f1a1b
Law manager now only requires the host to be conscious
2015-09-28 18:25:50 +02:00
Fox-McCloud
933ffcd7d0
Merge pull request #2197 from Markolie/stickyban
...
Add in-game stickyban interface
2015-09-28 03:20:37 -04:00
Fox-McCloud
5463ecb6b6
Merge pull request #2207 from Markolie/fixes3
...
Fix passive vent icon sprite, hopefully fix tvalves
2015-09-28 03:00:40 -04:00
Fox-McCloud
6a2c7a82ff
Merge pull request #2194 from tigercat2000/frunkenstien
...
Frankenstein
2015-09-28 02:58:44 -04:00
Markolie
c5e5b3d9ab
Fix passive vent icon sprite, hopefully fix tvalves
2015-09-28 08:49:12 +02:00
Fox-McCloud
a9989e2252
Merge pull request #2206 from Markolie/fixes3
...
Fix inflatable walls
2015-09-28 01:54:28 -04:00
Markolie
699bbd0972
Compile
2015-09-28 07:46:30 +02:00
