Fox McCloud
d440f9df3f
Merge pull request #2578 from FalseIncarnate/master
...
Overdose Change, Reagent Tweaks and Fixes, IPC Damage Fixes
2015-11-17 17:30:11 -05:00
Aurorablade
15cfe8c4bc
Second Lye recipie removed
2015-11-16 22:02:47 -05:00
FalseIncarnate
cd1527a05f
Overdose Change, Reagent Tweaks and Fixes, IPC Damage Fixes
...
Adjusts how Overdosing works
- Overdose effects now stop if you have less than the overdose threshold
for the given reagent in your system
- Previously, overdose effects would continue until all of the reagent
was removed from the body
- After dropping below the overdose threshold, reagents will process as
normal as long as they do not surpass the threshold again.
Tweaked some Synthetic-oriented reagents
- Synthetic drugs no longer will cause Toxins damage
- The toxins damage for these has been replaced with either another form
of damage or side-effect
- Degreaser no longer cures Toxins Damage in Synthetics
- Degreaser still acts as a chemical purgative and lube cleaner, but
helps cure certain side-effects much like Coffee does for organics.
Sterlizine recipe changed to require antihol and chlorine
- Effectively the same as the old recipe, except actually mixable
- Fixes #2030
Increases max_damage of MMI Holders to 200 (from 60)
- Now matches the max_damage for organic brains
- Should make IPC brain damage more consistent with organic brain damage
Gives IPCs the NO_POISON flag
- This should make IPCs immune to toxins damage again, as intended
originally.
- Fixes #2151 .
2015-11-16 16:37:33 -05:00
Aurorablade
bc7a0864d5
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into TooSpoopy
2015-11-16 01:15:41 -05:00
TheDZD
64533c3c56
Merge pull request #2535 from Fox-McCloud/snacks
...
Snacks
2015-11-14 18:25:05 -05:00
Fox-McCloud
c08959423c
Snacks
2015-11-13 17:16:47 -05:00
Fox-McCloud
a123b10572
Recipe Fix
2015-11-11 22:27:40 -05:00
Fox-McCloud
ab3ed53734
Kitchen Updates
2015-11-09 01:09:59 -05:00
Aurorablade
51abacac93
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into TooSpoopy
2015-11-06 12:08:51 -05:00
Fox-McCloud
2335c6be9d
Merge remote-tracking branch 'upstream/master' into barber-update
2015-11-06 06:30:59 -05:00
Fox-McCloud
17112cda3d
barber update 2.0
2015-11-05 06:51:00 -05:00
Fox-McCloud
40a5abbb4a
Barber Update
2015-11-05 02:04:46 -05:00
Fox-McCloud
4687620436
Adds Random Cigs
2015-11-04 22:47:18 -05:00
Aurorablade
845da63555
now you can make candles
2015-11-03 08:13:31 -05:00
Aurorablade
f5f7c0cde9
might not be doing this right but eh
2015-11-02 21:58:15 -05:00
Aurorablade
600d351950
added in gib subtype
2015-11-02 20:54:34 -05:00
Aurorablade
570cfbe566
Spoopy
2015-10-29 12:32:38 -04:00
Mark van Alphen
a9c424ca7c
Merge pull request #2419 from Crazylemon64/sleeper_ui
...
Sleeper NanoUI
2015-10-28 02:43:39 +01:00
Crazylemon64
9e0e68a8b6
Sleepers now use NanoUI
...
Also cuts out a few points of weirdness; No dialysis on bloodless races
like IPCs, and dialysis on simple_animals is no longer possible through
the interface or through href twiddling, as that caused a runtime.
Also, prevents href tweaking to dispense chemicals the sleeper doesn't
have.
2015-10-25 10:35:39 -07:00
TheDZD
7908591af3
Merge pull request #2386 from Fox-McCloud/reagents-seeing
...
Reagent Scanner/Seeing
2015-10-19 18:53:45 -04:00
TheDZD
d681cefa03
Merge pull request #2362 from Fox-McCloud/gc-everything
...
Garbage Collect Everything
2015-10-18 16:44:35 -04:00
Fox-McCloud
aabdfc3924
Reagent Scanner/Seeing
2015-10-18 00:44:15 -04:00
Fox-McCloud
06975138d1
Fixes Egg Runtime
2015-10-18 00:01:11 -04:00
TheDZD
9d45ee8b81
Merge pull request #2355 from Fox-McCloud/eye-fixes
...
Eyes Fixes and Chem Tweaks
2015-10-14 18:29:57 -04:00
Fox-McCloud
e60edf9345
Garbage Collect Everything
2015-10-13 20:23:26 -04:00
Fox-McCloud
f2c868da2f
Makes Monkey Cubes GC
2015-10-13 16:10:01 -04:00
Fox-McCloud
e19a8a405b
mitocholide buff
2015-10-12 23:17:13 -04:00
Fox-McCloud
e83ebc3d52
Eyes Fixes and Chem Tweaks
2015-10-12 19:39:12 -04:00
Crazylemon64
68d06bb0e4
Merge branch 'master' into fixes_petsay
...
Keeping things up to date, to make adding this branch later smooth
2015-10-11 15:26:09 -07:00
TheDZD
07770fdda7
Merge pull request #2321 from Fox-McCloud/another-del-pass
...
Another del->qdel pass
2015-10-09 18:05:00 -04:00
Crazylemon64
3c72286f2f
Custom_emote now used in place of emote("me")
...
Also fixes some emotes which didn't actually exist for their respective
characters.
Left untouched: Jungle mobs, whatever those are supposed to be.
2015-10-09 13:00:05 -07:00
Fox-McCloud
e17c6bde22
Another del->qdel pass
2015-10-08 16:49:10 -04:00
Fox-McCloud
5c512793b9
Removes the Rest of Pooled Objects
2015-10-08 14:18:40 -04:00
Fox-McCloud
69d7a7ed1d
Axes Some Pooling
2015-10-08 01:26:15 -04:00
Fox McCloud
559b03bfeb
Merge pull request #2297 from Markolie/itemcolor
...
Replace _color with item_color
2015-10-06 16:11:35 -04:00
Fox McCloud
73b2fc122a
Merge pull request #2291 from Markolie/movefix
...
Fixes and pinpointer update
2015-10-05 16:01:02 -04:00
Markolie
bff7a9a80c
Replace _color with item_color
2015-10-05 19:55:14 +02:00
Markolie
b24f5ff979
Fixes and pinpointer update
2015-10-05 00:26:43 +02:00
Crazylemon
e23b62ba80
Fixed the game/ side of the directory tree
...
Also restructured the stuck message conditional so it's less likely I
made a mistake.
2015-10-03 12:26:53 -07:00
Crazylemon
a9d19b9f11
i r gud at riting
2015-10-03 11:35:06 -07:00
Crazylemon
1607f64e06
Thoroughly flushes out every apparently obvious beaker drop exploit
...
This also updates the formatting on a few devices and updates them to
use forceMove()
2015-10-03 11:26:23 -07:00
Crazylemon
cbca437f9c
Patches up all reagent_machines to not accept beakers
...
I also patched up formatting and switched all .loc to .forceMove().
2015-10-03 10:58:38 -07:00
Markolie
6830928837
Bypass thick protection for syndicate borg hydro
2015-10-03 01:12:09 +02:00
TheDZD
de8e5ecfd0
Merge pull request #2254 from Markolie/swordnborg
...
Syndicate borg update, add medical syndicate borg, energy sword refactor
2015-10-02 15:49:57 -04:00
Markolie
f052512578
Fixes
2015-10-02 01:34:37 +02:00
Markolie
6bae20b0a0
Syringe gun update, borghydro update
2015-10-01 19:30:42 +02:00
Markolie
d40cfe582e
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into swordnborg
...
Conflicts:
icons/obj/surgery.dmi
2015-10-01 04:32:10 +02:00
Markolie
d18b18b5b4
Syndicate borg update, add medical syndicate borg, energy sword refactor
2015-10-01 04:21:24 +02:00
Tigercat2000
b5218bfb5c
Fixes monkey cubes, more or less
...
They will now unEquip() if they are in a mob, therefore clearing the hand
ref to them.
2015-09-30 09:34:11 -07:00
Fox McCloud
15c9873cdf
Merge pull request #2224 from Markolie/shitcode
...
Strange reagent fix, tod --> timeofdeath
2015-09-29 18:25:04 -04:00
