Commit Graph

28959 Commits

Author SHA1 Message Date
SkeletalElite
5afe9b079c Sprite Code 2018-09-08 14:27:33 -07:00
Crazy Lemon
ee6da8d62d Merge pull request #9486 from IrkallaEpsilon/patch-2
Attacking mirrors is now not spamable anymore
2018-09-04 18:28:29 -07:00
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
IrkallaEpsilon
c70f42d139 Attacking mirrors is now not spamable anymore
Kinda a funny bug that you can attack mirrors without a cooldown. A bug nonetheless. Not sure if this should fix it, but it was used to fix the no cooldown on Gas Cannisters.
2018-09-04 20:40:49 +02:00
Crazy Lemon
7d167fdd49 Merge pull request #9464 from Tails2091/LockerWeld
Fixes #8267 Double Weld Closet Removes Welding Tool
2018-09-04 10:27:44 -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
847ef225d0 Merge pull request #9479 from datlo/megaphonevoicefix
Fixes #8439, adds font check to the megaphone
2018-09-04 10:22:42 -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
4541f58ce7 Merge pull request #9370 from IrkallaEpsilon/patch-1
Removes Atmos Grenades from Surplus
2018-09-04 09:50:12 -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
7f86521753 Merge pull request #9283 from Aurorablade/PlasmaIsGrifingMe
Adds some Logging to some items
2018-09-04 09:23:11 -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
5f11e5945e Merge pull request #9367 from TDSSS/hypospray-belt
Allows medical belts to hold hyposprays
2018-09-04 09:21:37 -07:00
Crazy Lemon
ea70f174a0 Merge pull request #9368 from variableundefined/IPCConsoleFix
You can no longer see IPC (and invalid subjects) SE / UI in console
2018-09-04 09:20:56 -07:00
Crazy Lemon
599c58fb53 Merge pull request #9369 from variableundefined/Analyzer
Analyser > Analyzer
2018-09-04 09:04:14 -07:00
datlo
5c3aeef45e replace locate check 2018-09-04 11:47:15 +01: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
Crazy Lemon
c60e3ed007 Merge pull request #9471 from Agameofscones/SyndicateNOTAIL
Syndicate Suit Tail Fix
2018-09-03 21:24:07 -07:00
datlo
0418e51a21 Adds font check to the megaphone
Megaphone now carries over the user's font (wingdings, comic sans, and
any other font in mind.speech_span)
2018-09-03 16:32:20 +01: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
nicetoolbox
319883fa5d Fix plasmamen wizard space suit to let them cast spells 2018-09-01 17:04:35 -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
Tails2091
32e4b86130 Replaced Booleans With TRUE FALSE 2018-08-30 22:37:29 -04:00
Tails2091
0dc8c66884 Fixes Welder Being Removed With Locker 2018-08-30 22:14:28 -04: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
Superhats
5cda07a6da NUMBERRS :angryeyes: 2018-08-29 19:29:54 +02: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
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
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