aafa11712a
Removal of virus1/disease1 system. So long GBS/Jungle Fever, you'll be missed!
2014-07-16 00:53:08 -04:00
9b45dbabfb
Continued work in progress on a major revision of the NanoUI templating system.
...
Conflicts:
code/ATMOSPHERICS/components/omni_devices/filter.dm
code/ATMOSPHERICS/components/omni_devices/mixer.dm
code/game/dna/dna_modifier.dm
code/game/machinery/cryo.dm
code/game/machinery/kitchen/smartfridge.dm
code/modules/nano/nanoexternal.dm
code/modules/nano/nanomanager.dm
code/modules/nano/nanoui.dm
code/modules/power/apc.dm
code/modules/power/smes.dm
code/modules/reagents/Chemistry-Machinery.dm
nano/css/shared.css
nano/js/nano_update.js
nano/templates/escape_pod_console.tmpl
2014-07-15 07:22:15 -04:00
c54b9e3626
Slime update
...
Conflicts:
baystation12.dme
code/modules/mob/living/carbon/metroid/death.dm
code/modules/mob/living/carbon/metroid/metroid.dm
code/modules/mob/living/say.dm
code/modules/mob/transform_procs.dm
code/modules/reagents/Chemistry-Recipes.dm
maps/tgstation2.dmm
2014-07-15 00:50:41 -04:00
88d4e49efe
Fixed issues with cans complaining twice when trying to drink unopened and with transfering fluids between closed cans
...
Conflicts:
code/modules/reagents/reagent_containers/food/cans.dm
2014-07-14 06:46:38 -04:00
44e2f8acf2
Fixes human internal organs list
...
Conflicts:
code/modules/events/organ_failure.dm
code/modules/organs/blood.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/surgery/ribcage.dm
2014-07-13 08:51:55 -04:00
956706c7cf
Fix: Painkillers stay in body for decent time
...
Conflicts:
code/modules/reagents/Chemistry-Reagents.dm
2014-07-13 08:34:30 -04:00
776369d9ee
Health Analyzer can read all types of beneficial medicine
...
Conflicts:
code/game/objects/items/devices/scanners.dm
code/modules/reagents/Chemistry-Reagents.dm
2014-07-13 08:32:14 -04:00
2ff4a975f0
Sterilizine reduces germ_level on contact
...
Conflicts:
code/modules/reagents/Chemistry-Reagents.dm
2014-07-13 08:19:50 -04:00
cf52f9e734
Fixes reagent_containers not being usable for surgery
2014-07-13 07:42:10 -04:00
b9be3e6ed7
Stops buckled mobs from slipping (for now)
...
Conflicts:
code/game/turfs/simulated.dm
2014-07-13 06:48:17 -04:00
b8e3d45671
Cleaned up some reagent stuff, made Skrell alcoholics a legit issue, fixed IPC getting phoron contamination from clothing.
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/carbon/species.dm
code/modules/reagents/Chemistry-Reagents.dm
code/setup.dm
2014-07-12 21:58:54 -04:00
71169c7903
Made monkey cube subtypes define what type of monkey they spawn instead of weird switch in Expand().
...
Rewrote belly expanding accordingly. Also now you get a living monkey from the monkey.
Conflicts:
code/modules/reagents/reagent_containers/food/snacks.dm
2014-06-24 12:02:29 -04:00
d1932f7045
Moved same code into single organ helper to handle embedding.
...
Conflicts:
code/modules/mob/living/carbon/human/human_damage.dm
code/modules/mob/living/carbon/human/human_defense.dm
code/modules/organs/organ_external.dm
2014-06-24 11:46:56 -04:00
0626abe799
Lowers caused damage to make it destroy organs rarer.
2014-06-24 11:42:45 -04:00
2cf6acd4e7
Monkey cube now expand when eaten, leading to !!FUN!!
2014-06-24 11:42:34 -04:00
38559ab477
Makes forks usable.
...
Conflicts:
code/game/objects/items/weapons/kitchen.dm
icons/obj/kitchen.dmi
2014-06-22 10:58:50 -04:00
8a5079d006
atmos: fix everlasting fires
...
Fires were checking against a non-reduced air sample for existance, so
the reduced sample wasn't working in zburn when it failed the check.
Also fixed volatilefuel not being scaled in the phoron reagent.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
Conflicts:
code/ZAS/Fire.dm
code/modules/reagents/Chemistry-Reagents.dm
2014-06-22 10:54:19 -04:00
a6167c56eb
Temporary exploit fix pending permanant solution from upstream. Thanks for the find!
2014-06-22 06:49:26 -04:00
b64441cb26
Fixes FEA temperature_expose() being used...
...
...instead of ZAS fire_act().
Conflicts:
code/game/gamemodes/blob/theblob.dm
code/game/machinery/doors/airlock.dm
code/game/objects/structures/window.dm
code/game/turfs/simulated/walls_mineral.dm
code/modules/mob/living/carbon/alien/special/facehugger.dm
code/modules/reagents/reagent_dispenser.dm
2014-06-22 02:03:42 -04:00
3bfcaaec88
i'm still an idiot
...
fucked up more things...should work now :3
Cannot compile to properly test because of other errors that aren't mine
for once
2014-06-22 08:32:33 +09:30
55a61a67f3
negative hallucination amounts is bad
...
thanks UC. Negative hallucinations may result in people seeing too much
reality.
2014-06-22 08:17:34 +09:30
e17f2a0899
citalopram fix
...
Citalopram now functions as an antipsychotic, reducing hallucinations. 1
unit will counter 1u of mindbreaker, but not remove it - synaptazine for
that.
2014-06-22 08:12:41 +09:30
47327042eb
Fixes #5264
...
Viruses are properly transferred to spilled blood now.
Antigens prevent from infection properly.
Lowered frequency of blood puddle virus check to cut down on processing.
Conflicts:
code/game/turfs/simulated.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/organs/blood.dm
code/modules/reagents/Chemistry-Reagents.dm
2014-06-21 13:02:11 -04:00
e14c19f457
Changed color mixing to use weighted average instead of addition. Should help against values reaching FF too fast.
...
Adjusted color mixing helper to use inbuilt procs.
2014-06-20 12:08:30 -04:00
6e7139087e
Fixes human/checkarmor getting the armour...
...
...value for the wrong body part.
Whoever put ran_zone() in there wasn't thinking straight, as it's not
going to affect the part that actually gets damaged.
2014-06-19 09:39:44 -04:00
4a2993b20b
Separates the sharp flag into edge and sharp
...
Now weapons can properly cause cuts without necessarily having a greater
chance to remove limbs.
Also separates is_sharp, has_edge, and can_puncture.
Conflicts:
code/__HELPERS/unsorted.dm
code/modules/mob/living/living_defense.dm
code/modules/mob/living/silicon/robot/component.dm
code/modules/mob/living/simple_animal/bees.dm
code/modules/projectiles/gun.dm
code/modules/reagents/reagent_containers/syringes.dm
code/modules/surgery/eye.dm
2014-06-17 06:51:51 -04:00
4cfa12aae3
Chemistry Reagent runtime
2014-06-17 04:51:06 -04:00
ddfae9a035
Got another shuttle controller down. One to go.
2014-06-16 21:42:06 -04:00
386b1b8307
Fixes a bunch more hurt -> harm checks
2014-06-14 01:02:29 -04:00
1425001472
Bleh addiction
2014-06-09 19:01:10 -04:00
23f2885c01
Moar addiction fixuns
2014-06-09 01:54:03 -04:00
ff5ac9b8a3
Moar addiction fixuns
2014-06-09 01:08:30 -04:00
0e7ad2e4d5
Addictiveness fix
2014-06-08 23:00:57 -04:00
2c57ec96ae
First commit of the addiction system
2014-06-08 21:55:03 -04:00
d3eeb7945d
Hotfix for Zombie Powder not ever clearing Fakedeath.
2014-06-08 16:24:48 -04:00
4cfeada9d7
Added baggies for drugs, aww yeah
2014-06-06 04:16:39 -04:00
b23b5b62d9
Made hyperzine same color as salt, because HAHA
2014-06-06 02:43:38 -04:00
489cdf0096
Made hyperzine harder to make properly.
2014-06-06 02:35:10 -04:00
c840622c82
Added smaller spraybottle for drones.
2014-05-31 18:11:48 +02:00
687c46904e
SHOULD fix fueltank bomb assemblies >:D
2014-05-30 13:07:28 -04:00
b427215ca0
Carbon exploit fix
2014-05-26 06:23:39 -04:00
418ba281d7
Fixes circuit var for other consoles
...
Also cleans up attackby while we're at it.
Conflicts:
code/game/dna/dna_modifier.dm
code/game/machinery/computer/arcade.dm
code/game/supplyshuttle.dm
code/modules/mining/mine_items.dm
code/modules/reagents/Chemistry-Machinery.dm
code/modules/research/research_shuttle.dm
code/modules/research/server.dm
2014-05-26 06:21:03 -04:00
11a1deb1ac
Trying to cut down on attack lock spam
2014-05-24 17:17:38 -04:00
4b94406efb
Nerfs for OD
2014-05-23 23:10:04 +02:00
d6702496f9
Hyperzine fix
...
Now lasts shorter and isn't deadly at 5 units
2014-05-23 17:33:34 +02:00
be8d9eb026
Fixed spaceacillin metabolism, its useful again
2014-05-23 10:53:26 +02:00
1cb87e07cf
Made Cyanide more deadly, added OD to Hyperzine
...
Because fuck those who OD on Hyperzine, and Cyanide needs to kill faster
(not like cyanide is used by anyone else than Nukeops anyways)
2014-05-20 16:43:35 +02:00
c4d7c91e76
Map Bugfixes, some past due Ninja changes
2014-05-10 22:25:58 -04:00
48f00ee263
Revert "Thermite Effectiveness Scaling with Volume"
...
This reverts commit 9a66fd7edd
2014-05-07 19:54:01 -04:00
9a66fd7edd
Thermite Effectiveness Scaling with Volume
...
-The more thermite is applied to a wall, the faster it will burn
-Scales between approx 10-25 seconds
-Rwalls have a higher minimum threshold and burn time
-Applying thermite to a wall now leaves a visible stain on the wall
Conflicts:
code/game/turfs/simulated/walls.dm
icons/effects/effects.dmi
2014-05-04 22:37:44 -04:00
ZomgPonies