variableundefined
226e9a7b59
Fixes an accident
2018-08-31 17:46:05 +08:00
Fox McCloud
48e6b011b3
Merge pull request #9456 from variableundefined/MonitorRuntime2
...
Fix monitor runtime
2018-08-30 19:11:04 -04:00
variableundefined
556cf4f5e6
Fix monitor runtime
2018-08-30 19:06:29 +08:00
Crazy Lemon
29407243f8
Merge pull request #9450 from Ty-Omaha/sechailer2
...
Makes sechailer have less of my shitcode
2018-08-29 20:48:26 -07:00
Ty-Omaha
5c7569c3a4
spacing again
2018-08-29 22:48:07 -04:00
Ty-Omaha
9b6b60f9a6
key
2018-08-29 22:47:01 -04:00
Crazy Lemon
6504d8b174
Merge pull request #9452 from Kyep/depot_armory_shield_init_fix
...
Fixes depot armory Initialize() bug
2018-08-29 19:41:39 -07:00
Alffd
87f2d9701f
Fix check with emote on mute
2018-08-29 20:59:17 -04:00
Kyep
d47c98a997
fixes Initialize() bug
2018-08-29 14:51:45 -07:00
Unknown
62c7ba1f80
Merge remote-tracking branch 'upstream/master' into Memes
2018-08-29 19:23:06 +02:00
Ty-Omaha
f1e6a6cd91
stupid spacing
...
it's not even like that in my editor
2018-08-29 13:15:17 -04:00
Ty-Omaha
fd70f22eeb
less sechailer shitcode v2
2018-08-29 13:10:56 -04:00
Ty-Omaha
7c2b8cf55c
removes my sechailer shitcode
2018-08-29 11:46:21 -04:00
Crazy Lemon
8a027c9c22
Merge pull request #9428 from Agameofscones/paramedic_eva_rebranch
...
Paramedic EVA Resprite (Take 2)
2018-08-29 08:28:55 -07:00
Crazy Lemon
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
Crazy Lemon
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
Crazy Lemon
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
Crazy Lemon
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
variableundefined
8302024201
Fixes wire cutting runtime and other potential runtime.
2018-08-29 20:02:42 +08:00
Kyep
032557fa21
Fixes #7089 plus other bugs with spider obj attacks
2018-08-28 17:25:12 -07:00
Crazy Lemon
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
Ty-Omaha
5994cab9a9
spacing
2018-08-28 16:05:39 -04:00
Ty-Omaha
40abccc8c5
Nt rep stamp
2018-08-28 14:41:57 -04:00
Unknown
cf9e3f6bef
taking items off people is more consistent
...
so is putting them on people
2018-08-28 11:40:47 +02:00
Unknown
099c144a9e
IPC screen color
2018-08-28 11:07:07 +02:00
Unknown
dc0df1df66
fixes admin prison
2018-08-28 10:39:06 +02:00
Crazy Lemon
5b5934f276
Merge pull request #9420 from variableundefined/BorgAndAIRadioFix
...
Restore radio privacy to oppressed silicons
2018-08-27 23:53:46 -07:00
Crazy Lemon
9630f69edc
Merge pull request #8940 from Allfd/shockcollar
...
Adds shock muzzle
2018-08-27 19:02:41 -07:00
Crazy Lemon
a94375bcb2
Merge pull request #9366 from variableundefined/LogPrayer
...
Add logging to prayer
2018-08-27 18:37:17 -07:00
Gwydion Brain
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
variableundefined
688b510e63
Fixes borg & AI (and PAI) broadcasting what they say on the radio to everyone.
2018-08-26 22:48:35 +08:00
Superhats
747cf2044b
Hyposprays !
2018-08-26 14:53:51 +02:00
FishStix4Dayz
94b5b26418
deleted extra line of code
2018-08-24 19:20:47 -05:00
FishStix4Dayz
e55d50b199
New Vulp hairstyle
2018-08-23 22:28:51 -05:00
Crazy Lemon
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
Crazy Lemon
d59d2e76be
Merge pull request #9303 from Kyep/teleport_fixes
...
Teleportation Fixes
2018-08-22 22:44:18 -07:00
Crazy Lemon
058d339493
Merge pull request #9336 from Kyep/depot_fixes_1
...
Depot Fixes
2018-08-22 22:33:09 -07:00
Crazy Lemon
294c3c3ae9
Merge pull request #9284 from variableundefined/KineticAccelerator
...
Add in logging for kinetic accelerator
2018-08-22 22:31:57 -07:00
Crazy Lemon
ca003e0e3b
Merge pull request #9330 from variableundefined/Cardfix
...
Polaris card bugfix (Plus paperbin)
2018-08-22 22:28:44 -07:00
Crazy Lemon
2fdd1079d6
Merge pull request #9375 from variableundefined/RemoveSwapMaps
...
Remove swapmaps
2018-08-22 22:26:14 -07:00
Crazy Lemon
0eabc14cc6
Merge pull request #9384 from variableundefined/TicketRuntime
...
Fixes a runtime with admin ticket
2018-08-22 22:25:13 -07:00
Crazy Lemon
bf8520528c
Merge pull request #9257 from variableundefined/WelderCableOverheal
...
Adds overheal to welder & cable coil
2018-08-22 22:15:38 -07:00
Kyep
aad79ee59f
fixes depot npc target jam on lockered targets
2018-08-22 13:11:19 -07:00
Kyep
a7c2f854b5
fixes depot syndimobs being immune to melee damage
2018-08-22 12:08:32 -07:00
Birdtalon
15c947a21c
replaces equip_to_slot_or_del() with equip_to_slot_if_possible()
2018-08-21 19:00:57 +01:00
variableundefined
37d0056e0f
Fixes a runtime with admin ticket
2018-08-19 13:37:54 +08:00
variableundefined
6b28d2f267
Remove swapmaps
2018-08-17 19:08:32 +08:00
Crazy Lemon
275a4d4c54
Merge pull request #9325 from Agameofscones/medicalhypo_sprite
...
Medical Hypospray sprite change
2018-08-16 11:14:23 -07:00
Crazy Lemon
d5be15c700
Merge pull request #9333 from Birdtalon/grabbin-pills
...
Sanity check for pill creation (0u pills)
2018-08-16 10:45:46 -07:00
variableundefined
903eaf952b
Add prayer to logg
2018-08-16 19:52:32 +08:00
