Commit Graph

15897 Commits

Author SHA1 Message Date
Aurorablade 6a234d01c1 Fluffitem 2017-05-16 03:53:43 -04:00
Fox McCloud dd3ee12fd9 Merge pull request #6786 from FlattestGuitar/memetor
Makes msay be enabled by default 💬
2017-05-15 19:22:12 -04:00
Crazy Lemon 0e753b9bff Merge pull request #7309 from TullyBurnalot/HighNoon
Fixe typos with cowboy items
2017-05-14 11:14:50 -07:00
TullyBurnalot 08db7cde49 Fixe typos with cowboy items 2017-05-14 15:06:21 +01:00
TullyBurnalot c15a7c86a9 Fixes Disposal Bin Light 2017-05-14 14:42:56 +01:00
Fox McCloud dc1c61bfe6 Merge pull request #7306 from Crazylemon64/controller_reboot_fix
Adds the garbage controller to the set of rebootable controllers
2017-05-13 20:13:21 -04:00
Crazylemon64 3150419b74 Adds the garbage controller to the set of rebootable controllers 2017-05-13 17:04:45 -07:00
Fox McCloud f52bef5ec0 Merge pull request #7199 from Crazylemon64/controller_reboot_fix
Makes the master controller's auto-restart work
2017-05-13 19:55:03 -04:00
Fox-McCloud 31c9519f3e More GC Define Transitions 2017-05-13 04:24:05 -04:00
Fox McCloud 862a353d46 Fixes Some Diseases Not GCing (#7290)
* Fixes Some Diseases No GCing

* fix this too

* derp, I'm just an idiot

* but we can do this...
2017-05-12 23:21:22 -07:00
FlattestGuitar 530ac1a84e fixes faec 2017-05-13 00:47:51 +02:00
Fox McCloud afb6ea917a Merge pull request #7284 from Xantholne/Fixes01
Fixes for Western Megapack Clothes
2017-05-12 15:10:15 -04:00
Fox McCloud 35ba1c4991 Merge pull request #7281 from Aurorablade/PeekABoo
thrall check
2017-05-12 15:08:13 -04:00
Aurorablade f5f338b60c fixes sprites 2017-05-12 10:21:46 -04:00
Xantholne 700eb66061 Changed hint from clothes to uniform because some people might not figure that out. 2017-05-11 21:11:50 -06:00
Xantholne f5c850b9cf Fixes bornw cowboy boots name, adds hint to the clipon cowboy shirts 2017-05-11 21:02:18 -06:00
Fox McCloud 877b5d8457 Droppers Refactor (#7269)
* Droppers Refactor

* tweaks
2017-05-11 18:53:16 -07:00
Fox McCloud 20ab3ee64d Makes Clothing Accessories, Clothing with Accessories, Blood, and Spiderlings GC (#7272)
* Makes Clothing Accessories and Clothing with Accessories GC

* and spiderlings, apparently

* BLOOOD FINALLY GARBAGE COLLECTS!!!!
2017-05-11 18:50:43 -07:00
Aurorablade 841ef7bcf8 NOPE
..skipface not skipmask..
2017-05-11 01:39:47 -04:00
Aurorablade 88cc7c6113 false tweak 2017-05-11 01:39:18 -04:00
Aurorablade b2e932c131 thrall check 2017-05-10 23:59:32 -04:00
Fox McCloud 433a2d7cb7 Merge pull request #7125 from Xantholne/WesternMegapack
Adds Western Frontier Pack
2017-05-10 20:30:26 -04:00
Sam 27fc743150 stops overrunning bold tag 2017-05-10 19:49:22 +01:00
Xantholne 5bda45228d Removes codersprite hat, changes pathways, changes names to be more accurrate with hat. Any broken icon state should work correctly 2017-05-09 19:34:10 -06:00
Fox McCloud a890444f2f Merge pull request #7247 from Aurorablade/FiftyShadesOfGrey
Fifty shades of grey
2017-05-09 01:07:47 -04:00
Fox McCloud 467cb541ac Merge pull request #7157 from SamHPurp/clown-abuse
Removes a disgusting hack
2017-05-07 17:47:59 -04:00
GunDOSMk1 4ca774014a Adds "Cobra Hood" hair type to unathi. (#7237)
* Added Cobra hood hair call

* Added Cobra hood Sprites

* Add files via upload
2017-05-07 10:23:25 -07:00
Fox McCloud ff194f08e3 Guts Computer3 (#7217)
* Guts Computer3

* and the icons too
2017-05-07 10:22:36 -07:00
Crazylemon64 908c129fb9 Rebooting works now! 2017-05-07 02:41:55 -07:00
Twinmold93 acf9d1efcb Fixes Deep-Fried Grabs and Display Case Grabs (#7240)
* Fixes Grab's on Lethal Kitchen

Fixes the issue that I didn't have in testing. Fixes #7239

🆑 Twinmold
Fix: No longer able to cook grabs.
/🆑

* Fixes Display Case

Fixes #7212

* Changes Display Case to use ABSTRACT

So you can't put Ei'Nath into the case... Also, you already can't put
things like that in the deep fryer/other kitchen equipment, so that's
good.
2017-05-07 00:08:37 -07:00
Fox McCloud 7fd86096af More GC and Performance Fixes (#7248) 2017-05-06 23:48:18 -07:00
Aurorablade 2524f56928 urgh so many 2017-05-07 02:01:08 -04:00
Sam 7283274dd7 Github editor, how I hate thee
let me count the ways
2017-05-07 00:34:11 +01:00
Aurorablade e7f612eda0 Adds Tajaran Veil Clothing Racial Item (#7225)
* Initial commit Squashed

* hideeyes

* false changes

* coverseyes
2017-05-06 15:44:59 -07:00
Fox McCloud 8d4cc7b645 Organ and Autopsy Qdel Fixes and Minor Organ Tweaks (#7201)
* Organ and Autopsy Qdel Fixes

* organ tweaks

* tweaks
2017-05-06 15:26:45 -07:00
Fox McCloud 12c4b2933c Hydro and Bees GC fixes (#7221)
* Hydro and Bees GC fixes

* more shit
2017-05-06 15:01:36 -07:00
FlattestGuitar 764e813116 NT rep plasma suit (#7230) 2017-05-06 13:58:18 -07:00
Fox McCloud 9a43700e5d Makes All Instances of Implanting Use Proper Procs (#7224) 2017-05-05 15:45:37 -07:00
Sam a28a7a4da5 Updates to check to ensure they are clowns, not imposters 2017-05-02 07:44:23 +01:00
Fox McCloud 0fff889f92 Merge pull request #6582 from Aurorablade/Ripple
Don't Stand Under Shuttles
2017-05-01 19:47:50 -04:00
Aurorablade 66e81c90d4 Fox tweaks 2017-05-01 18:54:34 -04:00
Fox McCloud 36d4298e2b Merge pull request #7198 from Crazylemon64/organ_varname_refactor
Refactors "organs" to be "bodyparts" to end confusion once and for all
2017-04-30 17:00:44 -04:00
Crazylemon64 34cb73f40b Forgot to qdel 2017-04-30 13:36:08 -07:00
Crazylemon64 a493bcb460 Fox stuff 2017-04-30 03:14:23 -07:00
Fox McCloud 132876a976 Merge pull request #6654 from scrubmcnoob/Munitions-Express
Munitions Express
2017-04-30 03:15:10 -04:00
pinatacolada e52886734f bioluminescent kidan! 🐜 🏮 (#7137)
* bioluminescent kidan! 🐜 🏮

Gives Kidan an IC tab ability that makes them glow! wow!!!!!

This adds body and head markings, a new glowy organ to kidan lower body,
and glowing space ants! wow!!!!!!

Bioluminescence eats away nutriment, you can be glowing for some 13
minutes at roundstart before you starve out and the light goes out.
Dying also turns off the light. And shadowlings veil too.

Light color is based on a mix between head and body markings colors,
where the body markings color is slightly more predominant.

How bright you are depends on how much clothing you have. A full nakey
kidan is as bright as a flashlight, while a fully suited kidan isn't
bright at all. Rolling down jumpsuits makes you more bright too. Basic
idea is less clothes in the way, more brightness.

Oh you can also remove the light organ and implant it on other things,
and they will gain the ability to be bioluminescent. Yes you can be a
hot pink glowing neon green in the dark vulp. If you implant the organ
on someone else, the light will be based on the original kidan's colors.

kudos to Traveling Merchant for the sprite work, and KasparoVv for
helping me out with the markings part. Only one set of body markings is
done yet, but hey they're easy to make

🆑 pinatacolada, Travelling Merchant
add: Glowing kidan!
add: Kidan body markings
🆑

* address all the things

literally everything

* fixit

* death comes

* death goes

* i ded

* all the small things
2017-04-29 23:31:27 -07:00
Crazylemon64 1840074921 Refactors "organs" to be "bodyparts" to end confusion once and for all 2017-04-29 23:23:09 -07:00
scrubmcnoob 20c4384828 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' 2017-04-29 19:42:10 -04:00
Fox McCloud 042fc3a2cb Merge pull request #7187 from Tayyyyyyy/spacepod_cell_message
Notify user when cell inserted into spacepod
2017-04-29 16:19:20 -04:00
FalseIncarnate 7ef6f9a29c Fixes popcorn jellybean recipe, missing gum icon
Fixes #7193

Fixes #7194
2017-04-29 15:27:33 -04:00