Commit Graph

25614 Commits

Author SHA1 Message Date
Aurorablade
36f9727d4d fixes 2017-05-09 03:39:53 -04:00
Fox McCloud
a890444f2f Merge pull request #7247 from Aurorablade/FiftyShadesOfGrey
Fifty shades of grey
2017-05-09 01:07:47 -04: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
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
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
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
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
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
Fox McCloud
c599802495 Merge pull request #7178 from uraniummeltdown/lawset
Removes Roundstart Validhunt Lawsets
2017-05-06 19:09:16 -04: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
15eefd3b37 Minor Cell Charger Update (#7197) 2017-05-06 15:13:24 -07:00
Kyep
f3ef0d8c02 Fixes carded AIs generating checkTurfVis warnings (#7207)
* Fixes carded AIs generating checkTurfVis warnings

Fixes bug where carded AIs that click on turfs not visible to any camera
generate warnings to admins.

No CL as admin-only.

* Handles carded AIs better

* Fox request
2017-05-06 15:07:36 -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
FlattestGuitar
764e813116 NT rep plasma suit (#7230) 2017-05-06 13:58:18 -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
Sam
a28a7a4da5 Updates to check to ensure they are clowns, not imposters 2017-05-02 07:44:23 +01: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
0fff889f92 Merge pull request #6582 from Aurorablade/Ripple
Don't Stand Under Shuttles
2017-05-01 19:47:50 -04: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
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
Fox McCloud
96323dc13b Screen GC Issues (#7200) 2017-04-30 13:40:31 -07: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
e50e597dc6 Final tweaks
final tweaks
2017-04-29 22:41:47 -04: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
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