Commit Graph

7274 Commits

Author SHA1 Message Date
Dedhia
ec3d7379f0 Adds Grille Cooldown 2018-09-30 16:42:22 -07:00
TDSSS
0ad8a2b2de Makes weapons that deal no damage unable to ignite plasma statues 2018-09-30 16:44:00 +02:00
Purpose
6cb07cb70c Fixes a bunch of shown messages 2018-09-29 19:10:10 +01:00
variableundefined
68c35ccced Merge pull request #9527 from Ty-Omaha/muh-art
Fixes half the server crashing, removes canvases
2018-09-29 07:49:30 +08:00
nicetoolbox
fdc7297954 Reveal speaker identity when using megaphone 2018-09-27 20:36:13 -07:00
Fox McCloud
c187559e83 Merge pull request #9599 from Agameofscones/lipstickcodefix
Jade lipstick color fix (and minor refactor)
2018-09-27 17:48:15 -04:00
Gwydion Brain
d426ed1879 Adds comments and loadout 2018-09-27 14:17:32 -07:00
variableundefined
b9adf71445 Merge pull request #9550 from SamHPurp/well-defined,-some-would-say-chiseled
Updates use_power to use the Defines
2018-09-27 21:47:04 +08:00
tigercat2000
59fba23456 Merge pull request #9524 from alex-gh/autopsy_time_fix
Autopsy scanner now prints all times in human readable format.
2018-09-26 21:36:23 -07:00
Crazy Lemon
4991d152af Merge pull request #8811 from FalseIncarnate/kitchen
Mixing Bowls and Kitchen refactors
2018-09-26 17:32:39 -07:00
Crazy Lemon
ae68d43d46 Merge pull request #9032 from Anasari/CabinetDecon
Allow you to construct & deconstruct fire extinguisher cabinet
2018-09-26 17:31:15 -07:00
Crazy Lemon
f863b792bd Merge pull request #9601 from variableundefined/DropLocation
Adds in drop_location & AllowDrop()
2018-09-26 17:00:11 -07:00
Crazy Lemon
d3505ea9b9 Merge pull request #9543 from nicetoolbox/changeling-grab-fix
Fix changeling tentacle grab
2018-09-26 16:25:25 -07:00
Gwydion Brain
3e4c7b476b I have no idea how this works 2018-09-24 23:06:21 -07:00
Dedhia
524fdef17b General Fix 2018-09-24 20:36:17 -07:00
Dedhia
f68cf60f58 Fixes #9607 2018-09-24 15:16:16 -07:00
variableundefined
a499b0fc68 Paving the path for a bigger inventory refactor 2018-09-23 22:26:10 +08:00
Gwydion Brain
74ffb9bbdb Refactors lipstick
New variable [stickprefix] so RGB codes can be called on all color variants
2018-09-23 01:37:09 -07:00
Gwydion Brain
f0b2c596e1 Initial
Fixes jade lipstick being lime. Adds lime lipstick.
2018-09-22 21:39:14 -07:00
nicetoolbox
385f290bc3 Clean up some grabs 2018-09-16 12:28:39 -07:00
Purpose
037f215d16 updates vars to use the defines 2018-09-16 01:22:57 +01:00
Ty-Omaha
28acdb1e56 removes canvases 2
fully removes it as per tiger's critique
2018-09-12 02:40:32 -04:00
Ty-Omaha
52ab5abb0c canvas removal 2018-09-12 02:15:15 -04:00
alex-gh
b59aa8cb75 Autopsy scanner now prints all times in human readable format. 2018-09-11 17:39:05 +02:00
Fox McCloud
6832dbe74e Merge pull request #9373 from variableundefined/walletdecal
Wallet icon defaults to green if it is filled with an id of any type
2018-09-09 18:09:56 -04:00
Fox McCloud
b720aa4874 Merge pull request #9457 from variableundefined/30Mimes
Fixes math error with mime forcewall
2018-09-09 17:54:38 -04: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
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
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
7f86521753 Merge pull request #9283 from Aurorablade/PlasmaIsGrifingMe
Adds some Logging to some items
2018-09-04 09:23:11 -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
datlo
5c3aeef45e replace locate check 2018-09-04 11:47:15 +01: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
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
variableundefined
1f79722446 Fixes math error with mime forcewall 2018-08-31 07:28:42 +08:00
Unknown
62c7ba1f80 Merge remote-tracking branch 'upstream/master' into Memes 2018-08-29 19:23:06 +02: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
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
5203e2d5a4 Merge pull request #9435 from variableundefined/LegIt
Ensure bola cannot snare anyone without enough legs
2018-08-29 07:58:46 -07:00
Kyep
032557fa21 Fixes #7089 plus other bugs with spider obj attacks 2018-08-28 17:25:12 -07:00
variableundefined
b874549978 Ensure bola cannot snare anyone without enough legs 2018-08-28 22:35:31 +08:00
Unknown
b89eec6ce6 forceMove for storage item removal 2018-08-28 10:22:45 +02:00
Crazy Lemon
9806c7e156 Merge pull request #9392 from Birdtalon/posters
Small poster bugfix
2018-08-27 18:32:10 -07:00
TDSSS
503f9b9166 Fixed indentation 2018-08-23 12:34:06 +02:00
Crazy Lemon
097604953d Merge pull request #9321 from FreeStylaLT/girders_are_flammable
Makes girders melt
2018-08-23 00:41:30 -07:00
FreeStylaLT
3f960ce604 datum/ 2018-08-23 10:26:21 +03:00
Anasari
a135d01835 Fixes 2018-08-23 14:47:43 +08: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