mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-25 04:57:12 +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:
@@ -218,36 +218,36 @@
|
||||
qdel(src)
|
||||
return
|
||||
|
||||
|
||||
/obj/item/paper_bundle/update_icon()
|
||||
..()
|
||||
if(contents.len)
|
||||
var/obj/item/paper/P = src[1]
|
||||
icon_state = P.icon_state
|
||||
overlays = P.overlays
|
||||
underlays = 0
|
||||
var/i = 0
|
||||
var/photo
|
||||
for(var/obj/O in src)
|
||||
var/image/img = image('icons/obj/bureaucracy.dmi')
|
||||
if(istype(O, /obj/item/paper))
|
||||
img.icon_state = O.icon_state
|
||||
img.pixel_x -= min(1*i, 2)
|
||||
img.pixel_y -= min(1*i, 2)
|
||||
pixel_x = min(0.5*i, 1)
|
||||
pixel_y = min( 1*i, 2)
|
||||
underlays += img
|
||||
i++
|
||||
else if(istype(O, /obj/item/photo))
|
||||
var/obj/item/photo/Ph = O
|
||||
img = Ph.tiny
|
||||
photo = 1
|
||||
overlays += img
|
||||
if(i>1)
|
||||
desc = "[i] papers clipped to each other."
|
||||
/obj/item/paper_bundle/update_desc()
|
||||
. = ..()
|
||||
if(amount > 1)
|
||||
desc = "[amount] papers clipped to each other."
|
||||
else
|
||||
desc = "A single sheet of paper."
|
||||
if(photo)
|
||||
if(locate(/obj/item/photo) in src)
|
||||
desc += "\nThere is a photo attached to it."
|
||||
overlays += image('icons/obj/bureaucracy.dmi', "clip")
|
||||
return
|
||||
|
||||
/obj/item/paper_bundle/update_icon_state()
|
||||
if(contents.len)
|
||||
var/obj/item/paper/P = src[1]
|
||||
icon_state = P.overlays
|
||||
|
||||
/obj/item/paper_bundle/update_overlays()
|
||||
. = ..()
|
||||
underlays.Cut()
|
||||
if(contents.len)
|
||||
var/obj/item/paper/P = src[1]
|
||||
. += P.overlays
|
||||
for(var/obj/O in src)
|
||||
var/image/sheet = image('icons/obj/bureaucracy.dmi')
|
||||
if(istype(O, /obj/item/paper))
|
||||
sheet.icon_state = O.icon_state
|
||||
sheet.pixel_x -= min(1 * amount, 2)
|
||||
sheet.pixel_y -= min(1 * amount, 2)
|
||||
pixel_x = min(0.5 * amount, 1)
|
||||
pixel_y = min(1 * amount, 2)
|
||||
underlays += sheet
|
||||
else if(istype(O, /obj/item/photo))
|
||||
var/obj/item/photo/picture = O
|
||||
. += picture.tiny
|
||||
. += "clip"
|
||||
|
||||
Reference in New Issue
Block a user