Commit Graph

498 Commits

Author SHA1 Message Date
Chinsky
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
mwerezak
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
mwerezak
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
ZomgPonies
4cfa12aae3 Chemistry Reagent runtime 2014-06-17 04:51:06 -04:00
ZomgPonies
ddfae9a035 Got another shuttle controller down. One to go. 2014-06-16 21:42:06 -04:00
ZomgPonies
386b1b8307 Fixes a bunch more hurt -> harm checks 2014-06-14 01:02:29 -04:00
ZomgPonies
1425001472 Bleh addiction 2014-06-09 19:01:10 -04:00
ZomgPonies
23f2885c01 Moar addiction fixuns 2014-06-09 01:54:03 -04:00
ZomgPonies
ff5ac9b8a3 Moar addiction fixuns 2014-06-09 01:08:30 -04:00
ZomgPonies
0e7ad2e4d5 Addictiveness fix 2014-06-08 23:00:57 -04:00
ZomgPonies
2c57ec96ae First commit of the addiction system 2014-06-08 21:55:03 -04:00
Erthilo
d3eeb7945d Hotfix for Zombie Powder not ever clearing Fakedeath. 2014-06-08 16:24:48 -04:00
ZomgPonies
4cfeada9d7 Added baggies for drugs, aww yeah 2014-06-06 04:16:39 -04:00
ZomgPonies
b23b5b62d9 Made hyperzine same color as salt, because HAHA 2014-06-06 02:43:38 -04:00
ZomgPonies
489cdf0096 Made hyperzine harder to make properly. 2014-06-06 02:35:10 -04:00
Zuhayr
c840622c82 Added smaller spraybottle for drones. 2014-05-31 18:11:48 +02:00
ZomgPonies
687c46904e SHOULD fix fueltank bomb assemblies >:D 2014-05-30 13:07:28 -04:00
ZomgPonies
b427215ca0 Carbon exploit fix 2014-05-26 06:23:39 -04:00
mwerezak
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
ZomgPonies
11a1deb1ac Trying to cut down on attack lock spam 2014-05-24 17:17:38 -04:00
Regen
4b94406efb Nerfs for OD 2014-05-23 23:10:04 +02:00
Regen
d6702496f9 Hyperzine fix
Now lasts shorter and isn't deadly at 5 units
2014-05-23 17:33:34 +02:00
alex-gh
be8d9eb026 Fixed spaceacillin metabolism, its useful again 2014-05-23 10:53:26 +02:00
Regen
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
SamCroswell
c4d7c91e76 Map Bugfixes, some past due Ninja changes 2014-05-10 22:25:58 -04:00
ZomgPonies
48f00ee263 Revert "Thermite Effectiveness Scaling with Volume"
This reverts commit 9a66fd7edd.

Conflicts:
	code/game/turfs/simulated/walls.dm
2014-05-07 19:54:01 -04:00
ikarrus
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
iamgoofball
424a2522b9 CIVILLIAN OVERHAUL UNO: Chef and the Kitchen
Conflicts:
	baystation12.dme
	code/modules/reagents/reagent_containers/food/snacks.dm
	icons/obj/food.dmi
	icons/obj/kitchen.dmi
2014-05-03 21:15:41 -04:00
Zuhayr
abcb0bc686 Lousy goddamn indentation. 2014-05-03 17:36:17 -04:00
Zuhayr
a7f0508a1e Attempting to stop IPC from eating and drinking. 2014-05-03 17:36:05 -04:00
ZomgPonies
f9a773c84d Fix smoke 2014-04-20 02:34:40 -04:00
Rob Nelson
56d8ce28c8 Part 1 of economy rework: Spacecash refactor - See commit for full changelog.
* Implements stacking and stack overlays
 * Simplified tiers of cash (1,10,100,500,1000, may remove 500)
 * Simplified API (dispense_cash, count_cash)

Conflicts:
	code/modules/admin/admin_verbs.dm
	code/modules/admin/verbs/debug.dm
	code/modules/economy/ATM.dm
2014-04-19 20:47:41 -04:00
ESwordTheCat
c43652b33a Okay shards converted to pool usage now.
Conflicts:
	code/game/machinery/computer/arcade.dm
	code/game/machinery/doors/windowdoor.dm
	code/game/machinery/telecomms/traffic_control.dm
	code/game/objects/structures/displaycase.dm
	code/modules/mining/mine_turfs.dm
	code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
2014-04-19 19:57:53 -04:00
Mike
f98a2af41f Fueltanks leak fuel when wrenched open
Fueltanks now actually leak fuel when wrenched open. The leaking only occurs at the initial wrenching and when tank is moved.

Conflicts:
	code/modules/reagents/reagent_dispenser.dm
2014-04-19 16:41:17 -04:00
Jeremy Liberman
f43ef06431 Virology - NanoUI, gameplay tweaks, bugfixes
Conflicts:
	.gitignore
	code/game/machinery/kitchen/smartfridge.dm
	code/game/machinery/machinery.dm
	code/modules/food/recipes_microwave.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/virus2/isolator.dm
	nano/js/nano_base_helpers.js
2014-04-19 15:42:49 -04:00
Necaladun
d3757b9413 Hyperzine bottle
A pre-spawned bottle of hyperzine
2014-04-16 09:49:20 +09:30
alex-gh
cfbfa0e993 Smoke rework caused endless loops, reverted. 2014-04-08 01:47:56 +02:00
alex-gh
521ad31671 Revert the new lighting system. 2014-04-07 23:51:35 +02:00
RavingManiac
9bea0a097a trans_to_ingest now used for consumption of food, drink and pills instead of trans_to. This adds a ten second delay between ingestion and addition of the reagents to the body.
Conflicts:
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/reagent_containers/food/cans.dm
	code/modules/reagents/reagent_containers/food/condiment.dm
2014-04-05 17:39:14 +02:00
Jeremy Liberman
c74ff2d653 Fixes biogenerator typo, improper beaker splashing, and allows glass beakers to refill botany trays
Conflicts:
	code/modules/reagents/reagent_containers/glass.dm
2014-04-03 21:42:33 +02:00
Loganbacca
99751c0416 Reagent reaction_mob/turf tweaks
- Adds an if() check to reaction_mob for catching a very rare runtime related to mobs inhaling smoke reagents from just deleted smoke.
- Carbons reaction_turf proc now modifies a single dirt overlay layer, instead of just adding more decal objects to the turf.
- Added some checks to the radium and uranium reaction_turf proc so it doesn't stack multiple greenglow decals.
- Performed colon removal surgery on thermites reaction_turf proc, also tweaked it's overlay operation to correctly overlay a chemical puddle effect, instead of a melted wall effect.
- Removed space_cleaners overlays.Cut() code, since it was removing decals from turfs.

Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm
2014-04-03 18:21:45 +02:00
Loganbacca
0fba806c7b Chemsmoke rewrite
- Complete rewrite of the chemsmoke spawning code (everything that happens after the reaction to create the smoke).
- Moved it into it's own file since it's a little longer than the old one code-wise.
- Tweaked the smoke sprites; gave chemsmoke directions for more randomization, and tweaked the timing of their animations so they are smooth now.

Most of the code is documented, so you should be able to follow what's going on just reading through it. In short though:
- Chemsmoke now affects a circular area with a variable range depending on the total amount of chemsmoke created (no more 1-of-each-ingredient smoke grenades - sorry).
- The carried reagent volume in the cloud balances itself according to how big the affected area is (larger area, less carried reagent per turf).
- The carried reagent has more volume the closer you are to the centre of the cloud.
- The visual smoke effect scales with how big the affected area is.

Conflicts:
	code/game/objects/effects/effect_system.dm
	icons/effects/96x96.dmi
2014-04-03 18:21:26 +02:00
Chinsky
7f4388c5a3 Cleaned the fuck out of smoke.
Conflicts:
	code/ATMOSPHERICS/pipes.dm
	code/game/objects/effects/effect_system.dm
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/organs/organ_external.dm
2014-04-03 18:18:04 +02:00
alex-gh
2b5dbab3b2 Blob spore infection is now curable, added indication for blob infection 2014-03-24 12:08:20 +01:00
alex-gh
ee2fee1371 Killing blob spores can now infect you with the blob 2014-03-23 23:36:19 +01:00
Aryn
072bdcde60 I think I fixed everything it is possible to stuff a light source into.
Conflicts:
	code/game/dna/dna_modifier.dm
	code/game/machinery/Sleeper.dm
	code/game/objects/structures/transit_tubes.dm
	code/modules/reagents/Chemistry-Machinery.dm
	code/modules/recycling/disposal.dm
2014-03-21 09:58:54 -04:00
ZomgPonies
f1cdebaa60 Fixed custom item 2014-03-14 03:41:34 -04:00
Rob Nelson
0e8c675d18 Invert SOBER behavior, seems to work better that way.
Conflicts:
	html/changelog.html
2014-03-11 16:01:36 -04:00
alex-gh
79088a5668 Paracetamol side effect should work now 2014-03-10 12:59:06 +01:00
alex-gh
dcebe3aae1 Paracetamol will now metabolize properly 2014-03-10 12:22:45 +01:00