mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-20 03:25:49 +01:00
Port TG updating appearances (#17943)
* Get pants that match or else you gonna look silly yo
* Posters
* Fix other hud elements
* Rereviewed
* Update shotglass.dm
* Fix for new merged PRs
* Typo
* Coming across other stuff
* Update theblob.dm
* No takebacksies
* smh i forget to leave a comment
* Updated for the detgun and cards
* Should have rerun langserver again
* No longer plastic, more in scope
* Damn you bluespace
* Reverting turret logic, out of scope at this point
* Tweak that part
* Went over energy guns again, and fixed UI White's sprite sheet
* Welding masks, glasses, and JUSTICE
* Update portable_atmospherics.dm
* Cleaning up, clearing things up
* Review and suggestions
* Update valve.dm
* More tweaks
* Missing character
* Not distinct lightmasks, so they can be overlays
* Update generator.dm
* Add parameter so holodeck doesn't try to make a perfect copy
* Update unsorted.dm
* Spiders
* Better fix for spiders, fix vamps too
* Ghosts
* Update telekinesis.dm
* Cleaning up old procs
* It's set up to not copy datums... Unless they're in a list
* Donuts, duct tape, and detgun. D3VR coming to Early Access
* Update procs that interact with doors so they call update_state instead
* Forgot one spot, and actually might as well just force lock
* Cleaning up other things... Sigh, and kitty ears
* oops
* Getting used to how it works
* blinds
* Going back to the suit obscuring thing, so it doesn't update all the time
* Missed that from merging master
* I made this PR and forgot about it
* Fix runtimes in cards
* Make things a bit more unified
* Update update_icons.dm
* yarn, really?
* Update library_equipment.dm
* Update shieldgen.dm
* Every time Charlie merges something, I go back and see if I can improve things further
* what's this? more?
* Update misc_special.dm
* wow, paper
* Review
* More reviews
* To be sure, seems like being broken messed something sometimes
* Brought airlocks closer to how TG works to iron out some stuff
* Pizza and morgue
* Doesn't seem to hurt, tried with holodeck
* Revert "Doesn't seem to hurt, tried with holodeck"
This reverts commit 158529302b.
* Icon conflict
* Fix organ damage
* Don't ask how. Why. It's like that on prod too.
* Cutting down on things and updating from TG.
* More flexible. Just in case the thing you stuck it on didn't destroy.
* Hydro was one the things I touched earlier on, better rework it
* Reviews
* Cleaning up further, also bri'ish
* Undo a change I did, and switch over to a more recent implementation
* Update biogenerator.dm
* Rolling back to old airlocks, but with new duct taped note
* Functionally the same. I'd just rather not have the smoothing happen there
* Went over APCs again
* Fix welding helmet names in species files
* Update airlock.dm
* Update persistent_overlay.dm
* Oh, topic
This commit is contained in:
@@ -78,15 +78,12 @@
|
||||
used = TRUE
|
||||
update_icon()
|
||||
|
||||
/obj/item/fluff/tattoo_gun/update_icon()
|
||||
..()
|
||||
|
||||
overlays.Cut()
|
||||
|
||||
/obj/item/fluff/tattoo_gun/update_overlays()
|
||||
. = ..()
|
||||
if(!used)
|
||||
var/image/ink = image(src.icon, src, "ink_overlay")
|
||||
ink.icon += rgb(tattoo_r, tattoo_g, tattoo_b, 190)
|
||||
overlays += ink
|
||||
. += ink
|
||||
|
||||
/obj/item/fluff/tattoo_gun/New()
|
||||
..()
|
||||
@@ -1108,7 +1105,7 @@
|
||||
icon_state = "elishirt"
|
||||
item_state = "elishirt"
|
||||
item_color = "elishirt"
|
||||
displays_id = 0
|
||||
displays_id = FALSE
|
||||
|
||||
/obj/item/clothing/under/fluff/jay_turtleneck // Jayfeather: Jay Wingler
|
||||
name = "Mar's Pattern Custom Turtleneck"
|
||||
@@ -1117,7 +1114,7 @@
|
||||
icon_state = "jaywingler"
|
||||
item_state = "jaywingler"
|
||||
item_color = "jaywingler"
|
||||
displays_id = 0
|
||||
displays_id = FALSE
|
||||
|
||||
/obj/item/clothing/under/psysuit/fluff/isaca_sirius_1 // Xilia: Isaca Sirius
|
||||
name = "Isaca's suit"
|
||||
@@ -1131,7 +1128,7 @@
|
||||
item_state = "jane_sid_suit"
|
||||
item_color = "jane_sid_suit"
|
||||
has_sensor = 2
|
||||
sensor_mode = 3
|
||||
sensor_mode = SENSOR_COORDS
|
||||
|
||||
/obj/item/clothing/under/fluff/jane_sidsuit/verb/toggle_zipper()
|
||||
set name = "Toggle Jumpsuit Zipper"
|
||||
@@ -1159,7 +1156,7 @@
|
||||
icon_state = "roman"
|
||||
item_state = "maximus_armor"
|
||||
item_color = "maximus_armor"
|
||||
displays_id = 0
|
||||
displays_id = FALSE
|
||||
strip_delay = 100
|
||||
|
||||
/obj/item/clothing/under/fluff/aegis //PlagueWalker: A.E.G.I.S.
|
||||
@@ -1171,7 +1168,7 @@
|
||||
icon_state = "aegisuniform"
|
||||
item_state = "aegisuniform"
|
||||
item_color = "aegisuniform"
|
||||
displays_id = 0
|
||||
displays_id = FALSE
|
||||
|
||||
/obj/item/clothing/under/fluff/elo_turtleneck // vforcebomber: E.L.O.
|
||||
name = "E.L.O's Turtleneck"
|
||||
@@ -1666,7 +1663,7 @@
|
||||
icon = 'icons/obj/custom_items.dmi'
|
||||
fluff_material = TRUE
|
||||
|
||||
/obj/item/clothing/gloves/ring/fluff/update_icon()
|
||||
/obj/item/clothing/gloves/ring/fluff/update_icon_state()
|
||||
return
|
||||
|
||||
/obj/item/clothing/gloves/ring/fluff/attackby(obj/item/I as obj, mob/user as mob, params)
|
||||
|
||||
Reference in New Issue
Block a user