Commit Graph

1587 Commits

Author SHA1 Message Date
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
Mark van Alphen
d786a78e2e Merge branch 'master' into findnreplace 2017-04-19 20:41:05 +02:00
Kyep
1d3de58510 Removes Obj & Turf reactions from Plasma Dust
🆑 Kyep
rscdel: Plasma dust no longer creates plasma gas on objects or turfs
during reactions.
/🆑
2017-04-16 18:24:03 -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
Fox-McCloud
5631d36ff8 Converts Most Destroys to use QDEL_NULL 2017-04-04 23:08:41 -04:00
Crazy Lemon
c6abe7822b Merge pull request #6961 from Fox-McCloud/garbage-collect-stuffs
Garbage Collection and Code Cleanup
2017-04-01 22:58:52 -07:00
Mark van Alphen
2d1c04c112 Merge branch 'master' into findnreplace 2017-04-01 23:51:58 +02:00
Crazy Lemon
a79d57045e Merge pull request #6983 from Fox-McCloud/drinking-glass-update
Improves Drinking Glass Colorization
2017-03-30 18:30:30 -07:00
Fox McCloud
b4e512d259 Merge pull request #6962 from davipatury/effect-to-structure
Ports /tg/ obj damage system - Part 1
2017-03-30 17:34:26 -04:00
FlattestGuitar
6158f5dfc3 SR tweak 2017-03-29 10:12:10 +02:00
Fox-McCloud
7861df4dbe Improves Drinking Glass Colorization 2017-03-28 18:49:01 -04:00
Fox-McCloud
838d58b1a5 for fixes 2017-03-28 01:06:03 -04:00
davipatury
b91fbe264e effect/glowshroom to structure/glowshroom 2017-03-27 18:52:19 -03:00
davipatury
82bfd6e4b3 effect/spacevine to structure/spacevine 2017-03-27 18:51:08 -03:00
pinatacolada
bca1f4b852 fixessssss 2017-03-27 01:18:10 +01:00
Mark van Alphen
cd78336ab8 Merge branch 'master' into findnreplace 2017-03-25 00:11:39 +01:00
pinatacolada
64dd2fd656 plis 2017-03-24 10:45:14 +00:00
pinatacolada
eafa00f4b7 Dirty surgery rooms more prone to infections and ghetto surgery internal organ disinfection and dead limb revival
Combination of #6743 and #6479, because I am a pro mlg git user, who
would never have issues with the master branch no sir

Doing surgery with another person watching, even if they don't wear a
mask, doesn't warrant an infection either, but beyond that you are
pushing your luck

However, doing surgery in this scenario:

![why would you even do this](http://puu.sh/u7kLj/f3a444e1e9.jpg)
Resulted in acute infections to the heart and lungs.

So, recap:
-Wash your hands, wash your tools if needed, clean your room, wear a
mask and nothing bad happens.
You can even invite a friend to watch over
-Do brain surgery in a blood filled room with 11 clowns honking and
breathing cooties down your patient, and it's just bad
//-Letting your patient go without closing the incisions is also bad why
would you even do that (NOT WORKING ATM)
Allows to use a droppers, bottle, drinking glasses, drinking bottles.
beakers, sprays, or if you are brave
enough, an entire bucket, to treat internal organ infections with
alcohol. The more alcoholic the thing is the more it disinfects. This is
an available option during organ manipulation, at the time where you can
apply trauma kits and etc, so you can for instance apply a trauma kit
and then drip a bottle of vodka over someone's liver to treat infection.

Also adds a debridement surgery to revive dead EXTERNAL organs. Same
list of utensils as the previous, lets you apply mithocolide on a dead
limb or chest to make it unded. Surgery steps are incision, scalpel,
applying a reagent container, cauterize.

🆑 pinatacolada
add: dirty surgery environments get you nasty infections
add: ghetto surgery internal organ disinfection with alcohol
add: dead limb revival surgery step
/🆑
2017-03-23 15:10:28 +00:00
FlattestGuitar
55bad2927a Removes Crazylemon 2017-03-22 08:19:33 +01:00
Fox McCloud
7b16c169ff Merge pull request #6494 from Crazylemon64/risky_strange_reagent
Strange Reagent is now Riskier
2017-03-21 13:11:29 -04:00
Mark van Alphen
06b3460d6e Merge branch 'master' into findnreplace 2017-03-15 16:02:14 +01:00
Fox McCloud
c6e3fe3cdb Merge pull request #6734 from uraniummeltdown/plastic
Plastic is not a mineral anymore, plastic flaps can be constructed/deconstructed
2017-03-15 06:33:02 -04:00
uraniummeltdown
85260a72ba plastic is not a mineral anymore, plastic flaps are deconstructible, new construction.dm construction defines 2017-03-12 06:09:29 +04:00
Fox McCloud
3c7d990061 Merge pull request #6710 from uraniummeltdown/coverflags
Cleaned up clothing flags
2017-03-11 04:57:15 -05:00
uraniummeltdown
dd12fbe13a new flags_cover var for clothes, adjust existing flags 2017-03-10 11:33:42 +04:00
Mark van Alphen
cef5626f85 Merge branch 'master' into findnreplace 2017-03-09 17:32:42 +01:00
Markolie
3aa1399995 Implement usesound/toolspeed 2017-03-07 16:46:28 +01:00
Mark van Alphen
b0ded4b821 Merge branch 'master' into findnreplace 2017-03-05 12:09:52 +00:00
Crazylemon64
98e23c3202 Replaces random disease with necrosis 2017-02-26 11:04:24 -08:00
Fox McCloud
1e44336a3a Merge pull request #6555 from KasparoVy/vox-plasmaman-reagent-bsns
Reagent Oxygen is Toxic to Vox, Reagent Plasma Heals Plasmamen, Plasmaman Suit Autoextinguish & Plasmaman Exposure Burn Fixes
2017-02-25 17:11:08 -05:00
Crazylemon64
d9ceb1df76 Adds a %chance to give a disease to the revived patient
(given they have a mind, so that there's no abuse of this to infect the
station)
2017-02-24 19:29:25 -08:00
Crazylemon64
f8a4c7fead Changes %gib to a volume floor and a clone damage per application 2017-02-24 19:10:15 -08:00
Crazy Lemon
4c88191fb9 Merge pull request #6504 from Twinmold93/bloodpack_labeling
BloodPack Tagging/Pen Labeling
2017-02-24 18:20:46 -08:00
Crazy Lemon
9382db1767 Merge pull request #6430 from FalseIncarnate/botany2
Botany adjustments/re-addition/fixes/whatever (RE-UPLOAD)
2017-02-24 12:03:07 -08:00
KasparoVy
9dad350329 Desnowflakes the Special Reagent Handling & Amends+Completes Autoextinguish & Fixes Plasmaman Immolation Immunity Bug
- Moved Vox and Plasmamen special reagent handling to the Species datum
to avoid snowflaking in reagent code
- Removed the AUTOEXTINGUISH flag and turned it into a var to conserve
flags
- Adds Plasmaman EVA suit auto-extinguisher reloading. Eject the
depleted cartridges with an action button and fill them as you would a
fire extinguisher, then just slot them back into the suit.
- Fixes a bug where having NOBREATHE cured a Plasmaman of burning when
exposed to atmosphere.
- Fixes a bug where Plasmamen would burn in space or in totally-Plasma
environments. Inspired by /vg/station.
2017-02-22 00:12:01 -05:00
FalseIncarnate
c3a2a2878e Fixes Rice Grinding 2017-02-21 15:19:56 -05:00
Markolie
6982014a6e Replace all BYOND text macros 2017-02-21 15:41:37 +01:00
KasparoVy
71c2bcae7a Plasmaman Plasma Heal Consistency
Removes RNG from Plasmaman plasma heal, ties it to REAGENTS_EFFECT_MULTIPLIER and halves its healing amount.
2017-02-21 07:56:40 -05:00
KasparoVy
3f99632f11 Holds off on Oxygen Burning Plasmamen for now. 2017-02-21 07:26:44 -05:00
KasparoVy
829dcf4229 Oxygen is Toxic to the Vox, Plasma Heals Plasmamen, Plasmaman Suit Autoextinguishes, Oxygen Burns Plasmamen
Oxygen is toxic to the Vox (as toxic as plasma).
Plasma healing plasmaman from swindly @
https://github.com/tgstation/tgstation/pull/24209
Plasmaman suit auto-extinguishing actually does something now.
Oxygen burns Plasmamen.
2017-02-21 07:26:04 -05:00
Tigercat2000
c62930568e ~~Removes~~ Nerfs sentient AI in our code
- Added Wheatly core
2017-02-19 15:37:23 -08:00
Twinmold
c7eda9d78d BloodPack Tagging/Pen Labeling
With this, you can now use a pen on a bloodpack and add a label to it,
giving the ability to tag a bloodpack with the type of blood from
donations. Bloodpacks will now switch between "empty" and notso in
naming, depending on if there is reagent/blood inside or not.

:cl:Twinmold
Add: Ability to label bloodpacks with a pen, so you can now label a
bloodpack from donations without a handlabeler.
Add: Bloodpacks will now change name to say if they are empty or not.
/🆑
2017-02-18 13:11:51 -06:00
Crazylemon64
6b7fb9b3e4 Strange reagent has a chance to gib you now anyways 2017-02-18 00:00:25 -08:00
Krausus
4754d6b4b3 Fixes some sounds not being cached properly 2017-02-17 02:37:26 -05:00
Fox McCloud
078fb75ff5 Merge pull request #6402 from Crazylemon64/phlog_ignite_fix
Phlog now consistently ignites upon application.
2017-02-15 08:35:45 -05:00
Aurorablade
a39a0f92d9 1.5 growht cap 2017-02-13 08:32:36 -05:00
Aurorablade
6aa7905651 Growth Cap 2017-02-13 02:54:46 -05:00
Crazylemon64
1d61e3501d Phlog now consistently ignites upon application. 2017-02-11 13:48:20 -08:00
Markolie
3298f7edce Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates
# Conflicts:
#	icons/obj/objects.dmi
2017-02-08 19:25:47 +01:00