Commit Graph

13670 Commits

Author SHA1 Message Date
Fox McCloud ae352da0ea Merge pull request #6604 from Kyep/job_security
Supports +2 Security Officer slots
2017-05-16 02:09:33 -04:00
TravellingMerchant d2d1af7270 defines posters 2017-05-16 01:33:47 +01:00
Fox McCloud 195a907ffe Merge pull request #7123 from SamHPurp/Fixes
Fixes
2017-05-15 19:21:01 -04:00
Crazy Lemon fc28a3e27c Merge pull request #7297 from Fox-McCloud/more-gc-defines
More GC Define Transitions
2017-05-13 16:22:06 -07:00
Fox McCloud fc46a2c5a2 Merge pull request #7271 from Aurorablade/CultBugs
Fixes more cult bugs
2017-05-13 17:51:19 -04:00
Fox-McCloud bbd306d60f fix 2017-05-13 07:23:56 -04:00
Fox-McCloud 31c9519f3e More GC Define Transitions 2017-05-13 04:24:05 -04:00
Fox McCloud f8a97d3e86 Merge pull request #7266 from FlattestGuitar/mark-it-down-you-shall-be-hearing-of-me-a-lot
Adds italics and strikethrough to OOC
2017-05-12 15:09:49 -04: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 63f72a29be girders 2017-05-11 00:15:15 -04:00
Aurorablade dad47b848c missed one 2017-05-10 04:05:57 -04:00
Aurorablade cb88a19a25 commit 2017-05-10 03:58:26 -04:00
Aurorablade 36f9727d4d fixes 2017-05-09 03:39:53 -04:00
FlattestGuitar b02c82c2d1 Adds basic italics and strikethrough to OOC 2017-05-08 21:36:27 +02:00
uraniummeltdown a11c20ec03 Merge branch 'master' into rwall
# Conflicts:
#	code/game/turfs/simulated/walls_reinforced.dm
2017-05-08 10:51:39 +04:00
uraniummeltdown 82703b9309 rename defines 2017-05-08 10:48:11 +04:00
Sam 5e6ae560d6 Fixing errant reference 2017-05-07 23:10:13 +01:00
Fox McCloud 467cb541ac Merge pull request #7157 from SamHPurp/clown-abuse
Removes a disgusting hack
2017-05-07 17:47:59 -04:00
Fox McCloud 0f074ebaf9 Merge pull request #7250 from SamHPurp/Smoothes-fixed-walls
Fixes repaired r-walls not smoothing
2017-05-07 17:44:15 -04:00
uraniummeltdown e53bca695e add more rwall repair steps, remove metal rods dropping in support_rods state 2017-05-07 19:19:20 +04:00
uraniummeltdown 993a5709a0 cleanup file 2017-05-07 19:00:02 +04:00
uraniummeltdown eea890cb5d add rwall construction defines, examine hints for (de)con, fix some spelling and grammar 2017-05-07 18:31:56 +04:00
Fox McCloud cc703a4882 Merge pull request #7249 from Crazylemon64/radio_gc_fix
Radios no longer double-dip initialize 4noraisin
2017-05-07 06:03:58 -04:00
Sam 3997ded8bd smoooooooth 2017-05-07 10:19:13 +01:00
Crazylemon64 4c13e98a89 Patched the awkward period between pre-game and the round start not
having init
2017-05-07 02:06:27 -07:00
Sam 818ca57be6 Byond's grammatical helper thing is cool 2017-05-07 09:20:11 +01:00
Sam 9e30dfbdf7 Holy whip now references the station 2017-05-07 09:10:59 +01: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
Crazylemon64 6c8a20a825 Radios no longer double-dip initialize 4noraisin 2017-05-06 23:41: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 15eefd3b37 Minor Cell Charger Update (#7197) 2017-05-06 15:13:24 -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
Alffd a662a48794 Don't step on glass (#7223) 2017-05-06 14:58:32 -07:00
Aurorablade 860a50b2e6 tweaks (#7232) 2017-05-06 13:51:48 -07:00
Aurorablade 7a38edb953 REEEEEEEEEEEEEEEE (#7229) 2017-05-05 15:48:52 -07:00
Fox McCloud 9a43700e5d Makes All Instances of Implanting Use Proper Procs (#7224) 2017-05-05 15:45:37 -07:00
Kyep 31f1f7d34d Removed last two args 2017-05-01 22:43:39 -07:00
Kyep 518963425b Fixes vampire enthrall not creating VV or ATTACK: logs 2017-05-01 22:10:43 -07:00
Fox McCloud 98431f27a3 Merge pull request #7196 from Tayyyyyyy/shadowling_announce
Hide sling announcements from lobby
2017-05-01 19:26:36 -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
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 329fba9f14 Requested Changes
All the changes requested.
2017-04-29 21:58:27 -04:00
scrubmcnoob 20c4384828 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' 2017-04-29 19:42:10 -04:00
Tayyyyyyy 32d4098f67 Hide sling announcements 2017-04-29 18:14:14 -05:00
Crazy Lemon bb93c95067 Merge pull request #7192 from Fox-McCloud/destroyssss
Fixes More Destroys
2017-04-29 15:43:42 -07:00
Fox McCloud a565a8a84a Merge pull request #7186 from uraniummeltdown/update
Girder Code Update (Wood and Metal Rod Walls)
2017-04-29 16:23:31 -04:00
Fox-McCloud e32f6c997d Fixes More Destroys 2017-04-29 03:35:56 -04:00