cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 13:37:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source 
Conflicts:
	code/WorkInProgress/Mini/customitems.dm
This commit is contained in:
Tastyfish
2012-01-12 01:48:33 -05:00
parent e5abd35dae a8e8af6242
commit b5c8b89a4d
24 changed files with 111 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/carbon.dm
+7
View File
@@ -195,3 +195,10 @@
if(src.sleeping_willingly)
src.sleeping = 0
src.sleeping_willingly = 0
/mob/living/carbon/human/proc/GetOrgans()
var/list/L = list( )
for(var/t in organs)
if (istype(organs[text("[]", t)], /datum/organ/external))
L += organs[text("[]", t)]
return L
code/modules/mob/living/carbon/human/human.dm
+4 -2
View File
@@ -880,7 +880,8 @@
overlays += image("icon" = stain_icon, "layer" = MOB_LAYER)
if (wear_id)
overlays += image("icon" = 'mob.dmi', "icon_state" = "id[!lying ? null : "2"]", "layer" = MOB_LAYER)
if(wear_id.over)
overlays += image("icon" = 'mob.dmi', "icon_state" = "id[!lying ? null : "2"]", "layer" = MOB_LAYER)
if (client)
client.screen -= hud_used.intents
@@ -954,7 +955,8 @@
var/t1 = s_store.item_state
if (!t1)
t1 = s_store.icon_state
overlays += image("icon" = 'belt_mirror.dmi', "icon_state" = text("[][]", t1, (!( lying ) ? null : "2")), "layer" = MOB_LAYER)
if(!istype(wear_suit, /obj/item/clothing/suit/storage/armoredundersuit))
overlays += image("icon" = 'belt_mirror.dmi', "icon_state" = text("[][]", t1, (!( lying ) ? null : "2")), "layer" = MOB_LAYER)
s_store.screen_loc = ui_sstore1
if (h_store)
code/modules/mob/living/carbon/human/human_defense.dm
+3 -5
View File
@@ -63,14 +63,12 @@ emp_act
if(I.IsShield() && (prob(35)))
visible_message("\red <B>The reactive teleport system flings [src] clear of [attack_text]!</B>")
var/list/turfs = new/list()
for(var/turf/T in orange(6))
for(var/turf/T in orange(6,src))
if(istype(T,/turf/space)) continue
if(T.density) continue
if(T.x>world.maxx-6 || T.x<6) continue
if(T.y>world.maxy-6 || T.y<6) continue
turfs += T
if(!turfs.len) turfs += pick(/turf in orange(6))
else
if(!turfs.len)
turfs += pick(/turf in orange(6,src))
visible_message("\red <B>The reactive teleport system malfunctions!</B>")
var/turf/picked = pick(turfs)
if(!isturf(picked)) return