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

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

Browse Source
This commit is contained in:
LetterJay
2017-06-26 06:14:55 -05:00
parent 5571cca37c faa0849b4b
commit f1937eb1fc
5 changed files with 87 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/equipment/kinetic_crusher.dm
+2 -1
View File
@@ -176,8 +176,9 @@
if(istype(T, denied_type) || istype(src, T.denied_type))
to_chat(user, "<span class='warning'>You can't seem to attach [src] to [H]. Maybe remove a few trophies?</span>")
return FALSE
if(!user.transferItemToLoc(src, H))
return
H.trophies += src
forceMove(H)
to_chat(user, "<span class='notice'>You attach [src] to [H].</span>")
return TRUE
code/modules/mob/living/carbon/human/species.dm
+15 -4
View File
@@ -827,7 +827,10 @@
if(slot_belt)
if(H.belt)
return 0
if(!H.w_uniform && !nojumpsuit)
var/obj/item/bodypart/O = H.get_bodypart("chest")
if(!H.w_uniform && !nojumpsuit && (!O || O.status != BODYPART_ROBOTIC))
if(!disable_warning)
to_chat(H, "<span class='warning'>You need a jumpsuit before you can attach this [I.name]!</span>")
return 0
@@ -867,7 +870,9 @@
if(slot_wear_id)
if(H.wear_id)
return 0
if(!H.w_uniform && !nojumpsuit)
var/obj/item/bodypart/O = H.get_bodypart("chest")
if(!H.w_uniform && !nojumpsuit && (!O || O.status != BODYPART_ROBOTIC))
if(!disable_warning)
to_chat(H, "<span class='warning'>You need a jumpsuit before you can attach this [I.name]!</span>")
return 0
@@ -879,7 +884,10 @@
return 0
if(H.l_store)
return 0
if(!H.w_uniform && !nojumpsuit)
var/obj/item/bodypart/O = H.get_bodypart("l_leg")
if(!H.w_uniform && !nojumpsuit && (!O || O.status != BODYPART_ROBOTIC))
if(!disable_warning)
to_chat(H, "<span class='warning'>You need a jumpsuit before you can attach this [I.name]!</span>")
return 0
@@ -892,7 +900,10 @@
return 0
if(H.r_store)
return 0
if(!H.w_uniform && !nojumpsuit)
var/obj/item/bodypart/O = H.get_bodypart("r_leg")
if(!H.w_uniform && !nojumpsuit && (!O || O.status != BODYPART_ROBOTIC))
if(!disable_warning)
to_chat(H, "<span class='warning'>You need a jumpsuit before you can attach this [I.name]!</span>")
return 0