cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1585 from comma/master

Browse Source 
Surgery fixes and tweaks
This commit is contained in:
Mloc
2012-08-08 06:44:45 -07:00
parent 980825aeec 138e41dd54
commit 0d94175887
3 changed files with 845 additions and 1188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2004
code/game/objects/items/weapons/surgery_tools.dm
View File

File diff suppressed because it is too large Load Diff

4
code/modules/mob/living/carbon/metroid/life.dm
View File

@@ -10,11 +10,13 @@
if (stat == 2) if (stat == 2)
return return
if(stat == 2)
return
var/datum/gas_mixture/environment // Added to prevent null location errors-- TLE var/datum/gas_mixture/environment // Added to prevent null location errors-- TLE
if(src.loc) if(src.loc)
environment = loc.return_air() environment = loc.return_air()
//Apparently, the person who wrote this code designed it so that //Apparently, the person who wrote this code designed it so that
//blinded get reset each cycle and then get activated later in the //blinded get reset each cycle and then get activated later in the
//code. Very ugly. I dont care. Moving this stuff here so its easy //code. Very ugly. I dont care. Moving this stuff here so its easy

23
code/modules/research/xenoarchaeology/artifact_archaeo.dm
View File

@@ -19,18 +19,21 @@
/obj/item/weapon/ore/strangerock/attackby(obj/item/weapon/W as obj, mob/user as mob) /obj/item/weapon/ore/strangerock/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(istype(W,/obj/item/weapon/weldingtool/)) if(istype(W,/obj/item/weapon/weldingtool/))
if(!src.method) var/obj/item/weapon/weldingtool/w = W
if(inside) if(w.isOn() && (w.get_fuel() > 3))
var/obj/A = new src.inside(get_turf(src)) if(!src.method)
for(var/mob/M in viewers(world.view, user)) if(inside)
M.show_message("\blue The rock burns away revealing a [A.name].",1) var/obj/A = new src.inside(get_turf(src))
for(var/mob/M in viewers(world.view, user))
M.show_message("\blue The rock burns away revealing a [A.name].",1)
else
for(var/mob/M in viewers(world.view, user))
M.show_message("\blue The rock burns away into nothing.",1)
del src
else else
for(var/mob/M in viewers(world.view, user)) for(var/mob/M in viewers(world.view, user))
M.show_message("\blue The rock burns away into nothing.",1) M.show_message("\blue A few sparks fly off the rock, but otherwise nothing else happens.",1)
del src w.remove_fuel(4)
else
for(var/mob/M in viewers(world.view, user))
M.show_message("\blue A few sparks fly off the rock, but otherwise nothing else happens.",1)
/obj/item/weapon/ore/strangerock/acid_act(var/datum/reagent/R) /obj/item/weapon/ore/strangerock/acid_act(var/datum/reagent/R)
if(src.method) if(src.method)