Commit Graph

1609 Commits

Author SHA1 Message Date
tigercat2000
fef7abc867 Merge pull request #7672 from Fox-McCloud/syndicate-bomb-refactor
Refactors Syndicate Bombs and Adds Chemical Bombs
2017-07-04 11:53:55 -07:00
tigercat2000
1ae7f2930c Merge pull request #7689 from Fox-McCloud/thats-the-power-of-love
🎵 That's the Power of Love🎵
2017-07-04 11:15:32 -07:00
fludd12
58520a69a9 Fixes two things 2017-07-02 01:30:25 -04:00
Fox-McCloud
4492b5ece3 That's the Power of Love~ 2017-07-01 22:07:44 -04:00
tigercat2000
96bd0b80e0 Merge pull request #6516 from fludd12/Grey-Rework
Grey Rework
2017-06-30 08:29:31 -07:00
Fox-McCloud
b664f73a68 chemical bombs 2017-06-29 20:02:27 -04:00
Sam
560975b638 pedantry 2017-06-23 15:47:37 +01:00
Sam
4eeb706462 makes water coolers movable 2017-06-23 13:22:11 +01:00
Sam
4d57fff5c9 Updates Intents 2017-06-10 09:43:36 +01: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
Crazy Lemon
5c66160210 Merge pull request #6957 from Fox-McCloud/neurotoxin-nerf
Nerfs Neuro-Toxin
2017-05-17 14:45:40 -07:00
fludd12
757d4a66be Redoes everything 2017-05-16 23:07:50 -04: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
877b5d8457 Droppers Refactor (#7269)
* Droppers Refactor

* tweaks
2017-05-11 18:53:16 -07:00
Crazylemon64
908c129fb9 Rebooting works now! 2017-05-07 02:41:55 -07:00
Crazylemon64
ee7b0f070b Integrates corazone properly 2017-05-02 00:52:59 -07:00
Crazylemon64
528e359296 Refactors heart attacks, unbreaks incremental cloning 2017-05-01 05:35:45 -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
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
Fox-McCloud
2c54fa7406 Nerfs Neuro-Toxin 2017-03-27 04:53:48 -04: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