Commit Graph

17931 Commits

Author SHA1 Message Date
Crazy Lemon
61a39a71b0 Merge pull request #9255 from variableundefined/EconomyRefactor
Economy Refactor & Changes - Part 1
2018-09-04 17:14:25 -07:00
variableundefined
0b4ed1f610 Remove excessive var and add one missing return statement 2018-09-05 07:45:10 +08:00
Crazy Lemon
eb8ddf7598 Merge pull request #9411 from Ty-Omaha/emag
Allows Secure Smartfridges to be unlocked via Emag or EMP
2018-09-04 11:45:20 -07:00
Crazy Lemon
f171317983 Merge pull request #9465 from shazbot194/xeno_borg_fix
Fixes xeno borg
2018-09-04 10:26:23 -07:00
Crazy Lemon
89c900064e Merge pull request #9478 from variableundefined/HivelordStabilize
Fixes hivelord stabilizer
2018-09-04 10:23:51 -07:00
Crazy Lemon
7cb8ffe1a7 Merge pull request #9418 from FreeStylaLT/TMs_PR
Reposts #9340 - Kidan Sprite Stuff by TM
2018-09-04 10:20:51 -07:00
Crazy Lemon
c37170b868 Merge pull request #9259 from Kyep/make_meth_less_op
Reduces speed bonus from Meth
2018-09-04 09:46:55 -07:00
Crazy Lemon
b52da17809 Merge pull request #9260 from Kyep/blob_mouse
MouseBlobs
2018-09-04 09:26:23 -07:00
Crazy Lemon
cacd50a2e8 Merge pull request #9359 from Aurorablade/Formatting
Formats the HM in player panel
2018-09-04 09:22:10 -07:00
Crazy Lemon
599c58fb53 Merge pull request #9369 from variableundefined/Analyzer
Analyser > Analyzer
2018-09-04 09:04:14 -07:00
Crazy Lemon
d26dd5a850 Merge pull request #9475 from Kyep/bmp_bypass_fix
Fixes unintended bypass in BlackMarketPackers away mission
2018-09-03 21:24:36 -07:00
variableundefined
5b8b4fee5f Fixes hivelord stabilizer 2018-09-03 10:10:27 +08:00
Kyep
2c0a779b62 Fixes area/shutter error 2018-09-01 19:05:42 -07:00
Gwydion Brain
1adda8500e Syndicatesuit Tailfix 2018-08-31 22:06:49 -07:00
variableundefined
226e9a7b59 Fixes an accident 2018-08-31 17:46:05 +08:00
shazbot194
912b8a2223 Cleans up the code some 2018-08-30 21:33:12 -08:00
shazbot194
ab4ee9a355 Fixes xeno borg to not break 2018-08-30 20:12:12 -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
FreeStylaLT
adabbcbcca woops 2018-08-26 15:23:00 +03:00
FreeStylaLT
267fa29184 re-dos the PR 2018-08-26 11:20:39 +03:00