87f2d9701f
Fix check with emote on mute
2018-08-29 20:59:17 -04:00
5cda07a6da
NUMBERRS :angryeyes:
2018-08-29 19:29:54 +02:00
62c7ba1f80
Merge remote-tracking branch 'upstream/master' into Memes
2018-08-29 19:23:06 +02:00
e8e5928edd
Merge pull request #9430 from FlattestGuitar/forceMove
...
you can remove items from storage with forceMove() properly
2018-08-29 08:29:26 -07:00
8a027c9c22
Merge pull request #9428 from Agameofscones/paramedic_eva_rebranch
...
Paramedic EVA Resprite (Take 2)
2018-08-29 08:28:55 -07:00
17e8792b56
Merge pull request #9436 from Ty-Omaha/stamp
...
Fixes #3167 , Gives NT rep their own stamp instead of stamping as CC
2018-08-29 08:17:25 -07:00
4c1aa6ae35
Merge pull request #9434 from FlattestGuitar/nom-nom-handcuffs
...
more consistent checks for dressing and undressing your boss
2018-08-29 08:05:13 -07:00
7ed0f2ad0c
Merge pull request #9441 from Kyep/spider_obj_fixes
...
Fixes #7089 - plus other bugs with spider obj attacks
2018-08-29 08:04:04 -07:00
4184fdac89
Merge pull request #9445 from variableundefined/RuntimeAdminName
...
Fixes wire cutting runtime and two potential key_name runtime
2018-08-29 07:59:41 -07:00
5203e2d5a4
Merge pull request #9435 from variableundefined/LegIt
...
Ensure bola cannot snare anyone without enough legs
2018-08-29 07:58:46 -07:00
8302024201
Fixes wire cutting runtime and other potential runtime.
2018-08-29 20:02:42 +08:00
032557fa21
Fixes #7089 plus other bugs with spider obj attacks
2018-08-28 17:25:12 -07:00
033f342e3d
Merge pull request #9432 from FlattestGuitar/ipc-fix
...
IPC screen color changing on the fly or whatever
2018-08-28 13:54:32 -07:00
5994cab9a9
spacing
2018-08-28 16:05:39 -04:00
40abccc8c5
Nt rep stamp
2018-08-28 14:41:57 -04:00
b874549978
Ensure bola cannot snare anyone without enough legs
2018-08-28 22:35:31 +08:00
cf9e3f6bef
taking items off people is more consistent
...
so is putting them on people
2018-08-28 11:40:47 +02:00
099c144a9e
IPC screen color
2018-08-28 11:07:07 +02:00
dc0df1df66
fixes admin prison
2018-08-28 10:39:06 +02:00
b89eec6ce6
forceMove for storage item removal
2018-08-28 10:22:45 +02:00
5b5934f276
Merge pull request #9420 from variableundefined/BorgAndAIRadioFix
...
Restore radio privacy to oppressed silicons
2018-08-27 23:53:46 -07:00
9630f69edc
Merge pull request #8940 from Allfd/shockcollar
...
Adds shock muzzle
2018-08-27 19:02:41 -07:00
96a5c9f5a3
Merge pull request #9341 from taukausanake/breaks_abductors
...
Abducts #9233
2018-08-27 18:57:14 -07:00
0dd40d2ea3
Merge pull request #9421 from Ty-Omaha/cool-colors
...
Makes punching / harm intent attack animations red
2018-08-27 18:45:11 -07:00
a94375bcb2
Merge pull request #9366 from variableundefined/LogPrayer
...
Add logging to prayer
2018-08-27 18:37:17 -07:00
9806c7e156
Merge pull request #9392 from Birdtalon/posters
...
Small poster bugfix
2018-08-27 18:32:10 -07:00
e5e584804b
Paramedic EVA Racial Variants
...
Also fixed a typo in the santa suit comments.
Gave Paramedic EVA suit racial restrictions.
Gave Paramedic EVA suit same armor stats as basic EVA softsuit.
Gave Paramedic EVA suit better fitting description.
2018-08-27 15:20:05 -07:00
24e4846fd7
harm red
2018-08-26 11:30:39 -04:00
688b510e63
Fixes borg & AI (and PAI) broadcasting what they say on the radio to everyone.
2018-08-26 22:48:35 +08:00
747cf2044b
Hyposprays !
2018-08-26 14:53:51 +02:00
892c6f6c0d
Merge pull request #9389 from Agameofscones/MrChangsNeuSprite
...
Mr. Chang Vendor Sprite
2018-08-25 21:29:29 -07:00
94b5b26418
deleted extra line of code
2018-08-24 19:20:47 -05:00
e55d50b199
New Vulp hairstyle
2018-08-23 22:28:51 -05:00
097604953d
Merge pull request #9321 from FreeStylaLT/girders_are_flammable
...
Makes girders melt
2018-08-23 00:41:30 -07:00
3f960ce604
datum/
2018-08-23 10:26:21 +03:00
195e199552
Merge pull request #9061 from Anasari/TGRefundPort
...
Port over Fox's refactored syndicate item refund from TG.
2018-08-22 22:51:12 -07:00
0d12c1c5d7
Merge pull request #9205 from FreeStylaLT/theft_hint
...
Adds a location hint for the Theft objective
2018-08-22 22:48:27 -07:00
f14df8dfbb
Merge pull request #9219 from Aurorablade/BORKBORK
...
Limits Dogs from Lycancoughy virus
2018-08-22 22:46:54 -07:00
d59d2e76be
Merge pull request #9303 from Kyep/teleport_fixes
...
Teleportation Fixes
2018-08-22 22:44:18 -07:00
058d339493
Merge pull request #9336 from Kyep/depot_fixes_1
...
Depot Fixes
2018-08-22 22:33:09 -07:00
294c3c3ae9
Merge pull request #9284 from variableundefined/KineticAccelerator
...
Add in logging for kinetic accelerator
2018-08-22 22:31:57 -07:00
ca003e0e3b
Merge pull request #9330 from variableundefined/Cardfix
...
Polaris card bugfix (Plus paperbin)
2018-08-22 22:28:44 -07:00
b3f5af433a
Merge pull request #9371 from variableundefined/DefibPaddleDetach
...
Defib paddles snap away if you walk away from the defib
2018-08-22 22:27:03 -07:00
2fdd1079d6
Merge pull request #9375 from variableundefined/RemoveSwapMaps
...
Remove swapmaps
2018-08-22 22:26:14 -07:00
0eabc14cc6
Merge pull request #9384 from variableundefined/TicketRuntime
...
Fixes a runtime with admin ticket
2018-08-22 22:25:13 -07:00
b0505002e2
CL request for LateInitialize()
2018-08-22 22:19:11 -07:00
bf8520528c
Merge pull request #9257 from variableundefined/WelderCableOverheal
...
Adds overheal to welder & cable coil
2018-08-22 22:15:38 -07:00
2691273f32
Merge pull request #9397 from variableundefined/implantcasenodisappear
...
Stop implantcase from disappearing
2018-08-22 21:59:13 -07:00
5855e79003
Merge pull request #9382 from alex-gh/changeling_blood_fix
...
Fixes Changeling Fleshmend blood bug
2018-08-22 21:55:46 -07:00
4eda85a574
Merge pull request #9391 from Birdtalon/setting_species
...
Slightly alters set_species equipping (changeling hardsuit bug).
2018-08-22 21:54:29 -07:00
Alffd