shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into beepboop

Browse Source
This commit is contained in:
Poojawa
2018-03-20 23:00:12 -05:00
parent 2bb09bef5f 0d4e7f73f4
commit f3a806923c
1355 changed files with 3112 additions and 2226 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__HELPERS/mobs.dm
+4 -6
View File
@@ -399,13 +399,11 @@ Proc for attack log creation, because really why not
GET_COMPONENT_FROM(mood, /datum/component/mood, user)
if(mood)
switch(mood.mood) //Alerts do_after delay based on how happy you are
if(-INFINITY to MOOD_LEVEL_SAD2)
switch(mood.sanity) //Alters do_after delay based on how sane you are
if(SANITY_INSANE to SANITY_DISTURBED)
delay *= 1.25
if(MOOD_LEVEL_HAPPY3 to MOOD_LEVEL_HAPPY4)
delay *= 0.95
if(MOOD_LEVEL_HAPPY4 to INFINITY)
delay *= 0.9
if(SANITY_NEUTRAL to SANITY_GREAT)
delay *= 0.90
var/endtime = world.time + delay
var/starttime = world.time
code/__HELPERS/type2type.dm
+16 -16
View File
@@ -354,47 +354,47 @@
return 0
if(bpc & FULL_BODY)
covered_parts |= list("l_arm","r_arm","head","chest","l_leg","r_leg")
covered_parts |= list(BODY_ZONE_L_ARM,BODY_ZONE_R_ARM,BODY_ZONE_HEAD,BODY_ZONE_CHEST,BODY_ZONE_L_LEG,BODY_ZONE_R_LEG)
else
if(bpc & HEAD)
covered_parts |= list("head")
covered_parts |= list(BODY_ZONE_HEAD)
if(bpc & CHEST)
covered_parts |= list("chest")
covered_parts |= list(BODY_ZONE_CHEST)
if(bpc & GROIN)
covered_parts |= list("chest")
covered_parts |= list(BODY_ZONE_CHEST)
if(bpc & ARMS)
covered_parts |= list("l_arm","r_arm")
covered_parts |= list(BODY_ZONE_L_ARM,BODY_ZONE_R_ARM)
else
if(bpc & ARM_LEFT)
covered_parts |= list("l_arm")
covered_parts |= list(BODY_ZONE_L_ARM)
if(bpc & ARM_RIGHT)
covered_parts |= list("r_arm")
covered_parts |= list(BODY_ZONE_R_ARM)
if(bpc & HANDS)
covered_parts |= list("l_arm","r_arm")
covered_parts |= list(BODY_ZONE_L_ARM,BODY_ZONE_R_ARM)
else
if(bpc & HAND_LEFT)
covered_parts |= list("l_arm")
covered_parts |= list(BODY_ZONE_L_ARM)
if(bpc & HAND_RIGHT)
covered_parts |= list("r_arm")
covered_parts |= list(BODY_ZONE_R_ARM)
if(bpc & LEGS)
covered_parts |= list("l_leg","r_leg")
covered_parts |= list(BODY_ZONE_L_LEG,BODY_ZONE_R_LEG)
else
if(bpc & LEG_LEFT)
covered_parts |= list("l_leg")
covered_parts |= list(BODY_ZONE_L_LEG)
if(bpc & LEG_RIGHT)
covered_parts |= list("r_leg")
covered_parts |= list(BODY_ZONE_R_LEG)
if(bpc & FEET)
covered_parts |= list("l_leg","r_leg")
covered_parts |= list(BODY_ZONE_L_LEG,BODY_ZONE_R_LEG)
else
if(bpc & FOOT_LEFT)
covered_parts |= list("l_leg")
covered_parts |= list(BODY_ZONE_L_LEG)
if(bpc & FOOT_RIGHT)
covered_parts |= list("r_leg")
covered_parts |= list(BODY_ZONE_R_LEG)
return covered_parts
code/__HELPERS/unsorted.dm
+8 -8
View File
@@ -736,21 +736,21 @@ Turf and target are separate in case you want to teleport some distance from a t
return
/proc/parse_zone(zone)
if(zone == "r_hand")
if(zone == BODY_ZONE_PRECISE_R_HAND)
return "right hand"
else if (zone == "l_hand")
else if (zone == BODY_ZONE_PRECISE_L_HAND)
return "left hand"
else if (zone == "l_arm")
else if (zone == BODY_ZONE_L_ARM)
return "left arm"
else if (zone == "r_arm")
else if (zone == BODY_ZONE_R_ARM)
return "right arm"
else if (zone == "l_leg")
else if (zone == BODY_ZONE_L_LEG)
return "left leg"
else if (zone == "r_leg")
else if (zone == BODY_ZONE_R_LEG)
return "right leg"
else if (zone == "l_foot")
else if (zone == BODY_ZONE_PRECISE_L_FOOT)
return "left foot"
else if (zone == "r_foot")
else if (zone == BODY_ZONE_PRECISE_R_FOOT)
return "right foot"
else
return zone