cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-28 15:39:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Splits organs into organ/internal (#7441)

Browse Source
This commit is contained in:
Matt Atlas
2019-11-20 23:07:10 +01:00
committed by Werner
parent 60b60b9c0a
commit 5da2a9c24b
233 changed files with 1635 additions and 1427 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/crates.dm
+2 -2
View File
@@ -33,9 +33,9 @@
var/mob/living/L = usr
var/touchy_hand
if(L.hand)
touchy_hand = "r_hand"
touchy_hand = BP_R_HAND
else
touchy_hand = "l_hand"
touchy_hand = BP_L_HAND
if(L.electrocute_act(17, src, ground_zero = touchy_hand))
spark(src, 5, alldirs)
if(L.stunned)
code/game/objects/structures/extinguisher.dm
+2 -2
View File
@@ -34,9 +34,9 @@
return
if (ishuman(user))
var/mob/living/carbon/human/H = user
var/obj/item/organ/external/temp = H.organs_by_name["r_hand"]
var/obj/item/organ/external/temp = H.organs_by_name[BP_R_HAND]
if (user.hand)
temp = H.organs_by_name["l_hand"]
temp = H.organs_by_name[BP_L_HAND]
if(temp && !temp.is_usable())
to_chat(user, "<span class='notice'>You try to move your [temp.name], but cannot!</span>")
return
code/game/objects/structures/therapy.dm
+4 -4
View File
@@ -63,10 +63,10 @@
flick("echair1", src)
spark(src, 12, alldirs)
if(buckled_mob && istype(C))
if(electrocute_mob(buckled_mob, C, src, 1.25, "head"))
if(electrocute_mob(buckled_mob, C, src, 1.25, BP_HEAD))
to_chat(buckled_mob, "<span class='danger'>You feel a deep shock course through your body!</span>")
sleep(1)
if(electrocute_mob(buckled_mob, C, src, 1.25, "head"))
if(electrocute_mob(buckled_mob, C, src, 1.25, BP_HEAD))
buckled_mob.Stun(PN.get_electrocute_damage()*10)
visible_message("<span class='danger'>The electric chair goes off!</span>", "<span class='danger'>You hear an electrical discharge!</span>")
@@ -499,7 +499,7 @@
if("Initiate Neural Scan")
visible_message("<span class='warning'>[connected] begins humming with an electrical tone.</span>", "<span class='warning'>You hear an electrical humming.</span>")
if(H && connected.occupant.resolve() == H)
var/obj/item/organ/brain/sponge = H.internal_organs_by_name["brain"]
var/obj/item/organ/internal/brain/sponge = H.internal_organs_by_name[BP_BRAIN]
var/retardation = H.getBrainLoss()
if(sponge && istype(sponge))
if(!sponge.lobotomized)
@@ -555,7 +555,7 @@
visible_message("<span class='warning'>[connected] buzzes harshly.</span>", "<span class='warning'>You hear a sharp buzz.</span>")
break
var/obj/item/organ/brain/sponge = H.internal_organs_by_name["brain"]
var/obj/item/organ/internal/brain/sponge = H.internal_organs_by_name[BP_BRAIN]
if (!istype(sponge) || !sponge.traumas.len)
if(get_dist(user,src) <= 1)
to_chat(user, "<span class='danger'>Error: Subject not recognized. Terminating operation.</span>")
code/game/objects/structures/watercloset.dm
+2 -2
View File
@@ -389,9 +389,9 @@
/obj/structure/sink/attack_hand(mob/user as mob)
if (ishuman(user))
var/mob/living/carbon/human/H = user
var/obj/item/organ/external/temp = H.organs_by_name["r_hand"]
var/obj/item/organ/external/temp = H.organs_by_name[BP_R_HAND]
if (user.hand)
temp = H.organs_by_name["l_hand"]
temp = H.organs_by_name[BP_L_HAND]
if(temp && !temp.is_usable())
to_chat(user, "<span class='notice'>You try to move your [temp.name], but cannot!</span>")
return
code/game/objects/structures/window.dm
+1 -1
View File
@@ -273,7 +273,7 @@
var/state = G.state
qdel(G) //gotta delete it here because if window breaks, it won't get deleted
var/def_zone = ran_zone("head", 20)
var/def_zone = ran_zone(BP_HEAD, 20)
var/blocked = M.run_armor_check(def_zone, "melee")
switch (state)
if(1)