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

revert/fix jacket, CC pinpointer, re-add dark lord, greytide toolbox

Browse Source
This commit is contained in:
Kyep
2018-11-16 08:47:45 -08:00
parent 07f5e956ac
commit 2063795224
9 changed files with 57 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/spacesuits/miscellaneous.dm
+10
View File
@@ -84,6 +84,16 @@
armor = list(melee = 65, bullet = 55, laser = 35, energy = 20, bomb = 30, bio = 30, rad = 30)
flags = STOPSPRESSUREDMAGE | THICKMATERIAL
/obj/item/clothing/suit/space/deathsquad/officer
name = "officer jacket"
desc = "An armored jacket used in special operations."
icon_state = "detective"
item_state = "det_suit"
blood_overlay_type = "coat"
flags_inv = 0
slowdown = 0
w_class = WEIGHT_CLASS_NORMAL
//Space santa outfit suit
/obj/item/clothing/head/helmet/space/santahat
name = "Santa's hat"
code/modules/clothing/suits/miscellaneous.dm
-13
View File
@@ -595,19 +595,6 @@
"Vox" = 'icons/mob/species/vox/suit.dmi'
)
/obj/item/clothing/suit/browntrenchcoat/specops
name = "specops trench coat"
desc = "A reinforced, armored trench coat worn by special forces operatives."
allowed = list(/obj/item/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/restraints/handcuffs,/obj/item/tank,/obj/item/kitchen/knife/combat)
armor = list(melee = 80, bullet = 80, laser = 50, energy = 50, bomb = 100, bio = 100, rad = 100)
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT
unacidable = 1
strip_delay = 130
w_class = WEIGHT_CLASS_NORMAL
/obj/item/clothing/suit/blacktrenchcoat
name = "black trench coat"
desc = "That shade of black just makes you look a bit more evil. Good for those mafia types."
code/modules/mob/living/carbon/human/emote.dm
+1 -1
View File
@@ -238,7 +238,7 @@
start_tail_wagging(1)
else if(dna.species.bodyflags & TAIL_WAGGING)
if(!wear_suit || !(wear_suit.flags_inv & HIDETAIL) && !istype(wear_suit, /obj/item/clothing/suit/space))
if(!wear_suit || !(wear_suit.flags_inv & HIDETAIL))
message = "<B>[src]</B> starts wagging [p_their()] tail."
start_tail_wagging(1)
else
code/modules/mob/living/carbon/human/update_icons.dm
+1 -1
View File
@@ -1196,7 +1196,7 @@ var/global/list/damage_icon_parts = list()
overlays_standing[TAIL_LAYER] = image(accessory_s, "pixel_x" = body_accessory.pixel_x_offset, "pixel_y" = body_accessory.pixel_y_offset)
else if(tail && dna.species.bodyflags & HAS_TAIL) //no tailless tajaran
if(!wear_suit || !(wear_suit.flags_inv & HIDETAIL) && !istype(wear_suit, /obj/item/clothing/suit/space))
if(!wear_suit || !(wear_suit.flags_inv & HIDETAIL))
var/icon/tail_s = new/icon("icon" = 'icons/effects/species.dmi', "icon_state" = "[tail]_s")
if(dna.species.bodyflags & HAS_SKIN_COLOR)
tail_s.Blend(skin_colour, ICON_ADD)