cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-25 06:00:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Chameleon sprite fixes (#47322)

Browse Source
This commit is contained in:
Arkatos1
2019-10-25 02:36:39 -07:00
committed by Rob Bailey
parent 017d6fa2ed
commit dabba37db2
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/storage/uplink_kits.dm
+2 -1
View File
@@ -458,7 +458,7 @@
new /obj/item/clothing/glasses/chameleon(src)
new /obj/item/clothing/head/chameleon(src)
new /obj/item/clothing/mask/chameleon(src)
new /obj/item/clothing/neck/cloak/chameleon(src)
new /obj/item/clothing/neck/chameleon(src)
new /obj/item/storage/backpack/chameleon(src)
new /obj/item/radio/headset/chameleon(src)
new /obj/item/stamp/chameleon(src)
@@ -513,6 +513,7 @@
new /obj/item/clothing/glasses/chameleon/broken(src)
new /obj/item/clothing/head/chameleon/broken(src)
new /obj/item/clothing/mask/chameleon/broken(src)
new /obj/item/clothing/neck/chameleon/broken(src)
new /obj/item/storage/backpack/chameleon/broken(src)
new /obj/item/radio/headset/chameleon/broken(src)
new /obj/item/stamp/chameleon/broken(src)
code/modules/clothing/chameleon.dm
+9 -5
View File
@@ -651,25 +651,29 @@
. = ..()
chameleon_action.emp_randomise(INFINITY)
/obj/item/clothing/neck/cloak/chameleon
/obj/item/clothing/neck/chameleon
name = "black tie"
desc = "A neosilk clip-on tie."
icon_state = "blacktie"
resistance_flags = NONE
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
/obj/item/clothing/neck/cloak/chameleon
/obj/item/clothing/neck/chameleon
var/datum/action/item_action/chameleon/change/chameleon_action
/obj/item/clothing/neck/cloak/chameleon/Initialize()
/obj/item/clothing/neck/chameleon/Initialize()
. = ..()
chameleon_action = new(src)
chameleon_action.chameleon_type = /obj/item/clothing/neck
chameleon_action.chameleon_name = "Cloak"
chameleon_action.chameleon_name = "Neck Accessory"
chameleon_action.initialize_disguises()
/obj/item/clothing/neck/cloak/chameleon/emp_act(severity)
/obj/item/clothing/neck/chameleon/emp_act(severity)
. = ..()
if(. & EMP_PROTECT_SELF)
return
chameleon_action.emp_randomise()
/obj/item/clothing/neck/chameleon/broken/Initialize()
. = ..()
chameleon_action.emp_randomise(INFINITY)
code/modules/clothing/under/jobs/civilian/curator.dm
+2
View File
@@ -29,8 +29,10 @@
/obj/item/clothing/under/rank/civilian/curator/nasa
name = "\improper NASA jumpsuit"
desc = "It has a NASA logo on it and is made of space-proofed materials."
icon = 'icons/obj/clothing/under/color.dmi'
icon_state = "black"
item_state = "bl_suit"
mob_overlay_icon = 'icons/mob/clothing/under/color.dmi'
w_class = WEIGHT_CLASS_BULKY
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.02