Commit Graph

528 Commits

Author SHA1 Message Date
Fox-McCloud
549152f498 Merge remote-tracking branch 'upstream/master' into breathing-tube 2017-07-04 15:33:53 -04:00
Fox-McCloud
bf7b43ded5 Merge remote-tracking branch 'upstream/master' into embedding 2017-07-01 01:03:04 -04:00
Fox-McCloud
5ae7510038 Fixes Limb Augmentation Open Wound 2017-06-29 00:27:45 -04:00
Fox-McCloud
c210145f1d to_chat 2017-06-28 17:48:51 -04:00
Fox-McCloud
e8bbe783c6 arm augments 2017-06-28 17:01:34 -04:00
Fox-McCloud
585db8ba28 Breathing Tube Augment 2017-06-27 23:02:48 -04:00
Fox-McCloud
f1746e011e fixes 2017-06-27 14:45:25 -04:00
Fox-McCloud
9832d1b605 oops 2017-06-21 00:12:46 -04:00
Fox-McCloud
f41df2ae72 Adds in Limb Augmentation and Limb Company Selection 2017-06-20 05:28:35 -04:00
Sam
7c7c8c70cb Merge remote-tracking branch 'refs/remotes/origin/master' into Intent-defines 2017-06-10 10:16:33 +01:00
Sam
7cf499dcc1 Adds movement intents 2017-06-10 10:12:14 +01:00
Sam
4d57fff5c9 Updates Intents 2017-06-10 09:43:36 +01:00
Fox-McCloud
3e344e4526 fixes 2017-06-05 20:34:50 -04:00
Fox-McCloud
4f5c187d27 finally 2017-06-05 20:06:48 -04:00
Fox-McCloud
4a6d8cd1e1 mostly working now 2017-06-05 19:35:06 -04:00
Fox-McCloud
0daf8a6a7f Object Embedding 2017-06-05 16:37:21 -04:00
Crazylemon64
ca7a156c99 Cloning no longer stops the heart
Also fixes a runtime regarding emptying an EMP'd clone pod
2017-06-04 00:32:03 -07:00
tigercat2000
633c972f46 RnD autolathe removal + tech level overhaul 2017-06-01 11:34:29 -07:00
Fox McCloud
1c21d8eb98 Merge pull request #7403 from SamHPurp/Punching-above-its-weight
Refactoring to use the WEIGHT_CLASS defines.
2017-05-28 14:17:05 -04:00
Sam
2d13e2f7bf Converts /modules/ to using WEIGHT_CLASS_x 2017-05-28 01:25:09 +01:00
Fox McCloud
3587aad06e Merge pull request #6612 from Crazylemon64/partial_cloning
Cloning now puts you together bit by bit
2017-05-27 14:48:23 -04:00
Tayyyyyyy
780cddb615 Remove EMP shielding and voice shielding from headpocket 2017-05-23 23:52:21 -07:00
Tayyyyyyy
42615fcc46 Allow dislodging of headpocket via strip panel 2017-05-23 16:31:06 -07:00
Tayyyyyyy
b2ab4dcd42 Change dislodge method to stun instead of harmbaton 2017-05-23 01:40:52 -07:00
Tayyyyyyy
e01c0fcd6a Oops didn't mean to do that 2017-05-23 00:33:21 -07:00
Tayyyyyyy
8232f4f9c7 Add headpocket icon 2017-05-23 00:26:20 -07:00
Tayyyyyyy
80c3aeaccb Add necessary skrell headpocket functions 2017-05-23 00:25:47 -07:00
Tayyyyyyy
4956f2a425 Switch to cleaner implementation 2017-05-22 22:47:05 -07:00
Tayyyyyyy
a005a3e553 Implement head pocket 2017-05-22 02:01:05 -07:00
Fox-McCloud
31c9519f3e More GC Define Transitions 2017-05-13 04:24:05 -04: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
9a43700e5d Makes All Instances of Implanting Use Proper Procs (#7224) 2017-05-05 15:45:37 -07:00
Crazylemon64
528e359296 Refactors heart attacks, unbreaks incremental cloning 2017-05-01 05:35:45 -07:00
Crazylemon64
8a065238e8 Cloning now puts you together bit by bit 2017-05-01 05:34:12 -07: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
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
Crazy Lemon
893fd2178e Merge pull request #6896 from pinatacolada/greasyhandsforrealsies
Dirty surgery rooms more prone to infections and ghetto surgery internal organ disinfection and dead limb revival
2017-04-26 18:51:10 -07:00
Crazy Lemon
4140b89b33 catch a possible runtime real quicklike 2017-04-16 15:03:15 -07:00
Markolie
d9653c79f5 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into findnreplace
# Conflicts:
#	code/game/machinery/recharger.dm
#	code/game/objects/items/devices/autopsy.dm
#	code/game/objects/items/devices/modkit.dm
#	code/game/objects/structures/lattice.dm
2017-04-14 18:15:12 +02:00
pinatacolada
fae387b51a i went to great lengths to fix this 2017-04-06 18:34:38 +01:00
Fox-McCloud
5631d36ff8 Converts Most Destroys to use QDEL_NULL 2017-04-04 23:08:41 -04:00
Mark van Alphen
2d1c04c112 Merge branch 'master' into findnreplace 2017-04-01 23:51:58 +02:00
Crazy Lemon
8cf82bcb7a Merge pull request #6937 from Fox-McCloud/autopsy
Autopsies No Longer Need Surgery
2017-03-30 18:36:21 -07:00
davipatury
8963e96c41 effect/spider to structure/spider 2017-03-27 19:01:25 -03:00
pinatacolada
05580dc409 spesses 2017-03-27 13:43:18 +01:00
Fox McCloud
f7f127042c Merge pull request #6679 from Kyep/terrorspiders-PR5
Terror Spiders 5 - Fixes & Tweaks II
2017-03-27 02:27:19 -04:00
pinatacolada
ed875e2d40 oops spacing 2017-03-27 01:22:15 +01:00
pinatacolada
bca1f4b852 fixessssss 2017-03-27 01:18:10 +01:00
Fox-McCloud
4137f237d7 Autopsies No Longer Need Surgery 2017-03-26 00:31:50 -04:00