cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into ofChemistryAndStuff

Browse Source 
Conflicts:
	code/datums/recipe.dm
	code/game/machinery/bots/farmbot.dm
	code/game/machinery/bots/medbot.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/objects/effects/chem/chemsmoke.dm
	code/game/objects/effects/effect_system.dm
	code/game/objects/items/toys.dm
	code/game/objects/items/weapons/extinguisher.dm
	code/game/objects/items/weapons/mop.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/organs/organ_internal.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/Chemistry-Recipes.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
	code/modules/reagents/reagent_containers/pill.dm
	code/modules/reagents/reagent_containers/spray.dm
	maps/exodus-1.dmm
This commit is contained in:
Kelenius
2015-04-28 10:49:26 +03:00
parent 7a3c8d2304 bf43270624
commit 317abc6b79
999 changed files with 26502 additions and 23206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/virus2/biohazard destroyer.dm
View File

@@ -10,7 +10,7 @@
for(var/path in accepts)
if(I.type in typesof(path))
user.drop_item()
del(I)
qdel(I)
overlays += image('icons/obj/pipes/disposal.dmi', "dispover-handle")
return
user.drop_item()

4
code/modules/virus2/items_devices.dm
View File

@@ -64,7 +64,7 @@
for(var/mob/living/carbon/target in view(1, get_turf(src)))
if(airborne_can_reach(get_turf(src), get_turf(target)))
infect_virus2(target, src.virus2)
del src
qdel(src)
/obj/item/weapon/virusdish/examine(mob/user)
..()
@@ -91,7 +91,7 @@
if(prob(50))
user << "\The [src] shatters!"
del src
qdel(src)
///////////////GNA DISK///////////////