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

Merge branch 'master' of https://github.com/Baystation12/Baystation12

Browse Source
This commit is contained in:
Zuhayr
2013-06-25 23:55:01 -07:00
parent e363157b2a 31f80350a7
commit a877a2a9a8
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/WorkInProgress/autopsy.dm
View File

@@ -78,7 +78,7 @@
/obj/item/weapon/autopsy_scanner/verb/print_data() /obj/item/weapon/autopsy_scanner/verb/print_data()
set src in view(usr, 1) set src in view(usr, 1)
set name = "Print Data" set name = "Print Data"
if(usr.stat) if(usr.stat || !(istype(usr,/mob/living/carbon/human)))
usr << "No." usr << "No."
return return

2
code/game/gamemodes/malfunction/Malf_Modules.dm
View File

@@ -85,7 +85,7 @@ rcd light flash thingy on matter drain
for(var/mob/V in hearers(M, null)) for(var/mob/V in hearers(M, null))
V.show_message("\blue You hear a loud electrical buzzing sound!", 2) V.show_message("\blue You hear a loud electrical buzzing sound!", 2)
spawn(50) spawn(50)
explosion(get_turf(M), 0,1,1,0) explosion(get_turf(M), 0,1,2,3)
del(M) del(M)
else usr << "Out of uses." else usr << "Out of uses."
else usr << "That's not a machine." else usr << "That's not a machine."

1
code/modules/mob/transform_procs.dm
View File

@@ -137,7 +137,6 @@
return return
for(var/obj/item/W in src) for(var/obj/item/W in src)
drop_from_inventory(W) drop_from_inventory(W)
regenerate_icons()
monkeyizing = 1 monkeyizing = 1
canmove = 0 canmove = 0
icon = null icon = null

4
code/modules/organs/organ_external.dm
View File

@@ -308,6 +308,10 @@
//Updating wounds. Handles wound natural I had some free spachealing, internal bleedings and infections //Updating wounds. Handles wound natural I had some free spachealing, internal bleedings and infections
/datum/organ/external/proc/update_wounds() /datum/organ/external/proc/update_wounds()
if((status & ORGAN_ROBOT)) //Robotic limbs don't heal or get worse.
return
for(var/datum/wound/W in wounds) for(var/datum/wound/W in wounds)
// wounds can disappear after 10 minutes at the earliest // wounds can disappear after 10 minutes at the earliest
if(W.damage == 0 && W.created + 10 * 10 * 60 <= world.time) if(W.damage == 0 && W.created + 10 * 10 * 60 <= world.time)