mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 20:16:55 +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:
@@ -102,7 +102,7 @@
|
||||
|
||||
/obj/item/robot_parts/robot_suit/New()
|
||||
..()
|
||||
updateicon()
|
||||
update_icon(UPDATE_OVERLAYS)
|
||||
|
||||
/obj/item/robot_parts/robot_suit/Destroy()
|
||||
QDEL_NULL(l_arm)
|
||||
@@ -117,20 +117,20 @@
|
||||
/obj/item/robot_parts/robot_suit/attack_self(mob/user)
|
||||
return
|
||||
|
||||
/obj/item/robot_parts/robot_suit/proc/updateicon()
|
||||
overlays.Cut()
|
||||
/obj/item/robot_parts/robot_suit/update_overlays()
|
||||
. = ..()
|
||||
if(l_arm)
|
||||
overlays += "l_arm+o"
|
||||
. += "l_arm+o"
|
||||
if(r_arm)
|
||||
overlays += "r_arm+o"
|
||||
. += "r_arm+o"
|
||||
if(chest)
|
||||
overlays += "chest+o"
|
||||
. += "chest+o"
|
||||
if(l_leg)
|
||||
overlays += "l_leg+o"
|
||||
. += "l_leg+o"
|
||||
if(r_leg)
|
||||
overlays += "r_leg+o"
|
||||
. += "r_leg+o"
|
||||
if(head)
|
||||
overlays += "head+o"
|
||||
. += "head+o"
|
||||
|
||||
/obj/item/robot_parts/robot_suit/proc/check_completion()
|
||||
if(l_arm && r_arm)
|
||||
@@ -158,7 +158,7 @@
|
||||
user.drop_item()
|
||||
W.forceMove(src)
|
||||
l_leg = W
|
||||
updateicon()
|
||||
update_icon(UPDATE_OVERLAYS)
|
||||
|
||||
if(istype(W, /obj/item/robot_parts/r_leg))
|
||||
if(r_leg)
|
||||
@@ -166,7 +166,7 @@
|
||||
user.drop_item()
|
||||
W.forceMove(src)
|
||||
r_leg = W
|
||||
updateicon()
|
||||
update_icon(UPDATE_OVERLAYS)
|
||||
|
||||
if(istype(W, /obj/item/robot_parts/l_arm))
|
||||
if(l_arm)
|
||||
@@ -174,7 +174,7 @@
|
||||
user.drop_item()
|
||||
W.forceMove(src)
|
||||
l_arm = W
|
||||
updateicon()
|
||||
update_icon(UPDATE_OVERLAYS)
|
||||
|
||||
if(istype(W, /obj/item/robot_parts/r_arm))
|
||||
if(r_arm)
|
||||
@@ -182,7 +182,7 @@
|
||||
user.drop_item()
|
||||
W.forceMove(src)
|
||||
r_arm = W
|
||||
updateicon()
|
||||
update_icon(UPDATE_OVERLAYS)
|
||||
|
||||
if(istype(W, /obj/item/robot_parts/chest))
|
||||
var/obj/item/robot_parts/chest/CH = W
|
||||
@@ -192,7 +192,7 @@
|
||||
user.drop_item()
|
||||
W.forceMove(src)
|
||||
chest = W
|
||||
updateicon()
|
||||
update_icon(UPDATE_OVERLAYS)
|
||||
else if(!CH.wired)
|
||||
to_chat(user, "<span class='notice'>You need to attach wires to it first!</span>")
|
||||
else
|
||||
@@ -206,7 +206,7 @@
|
||||
user.drop_item()
|
||||
W.forceMove(src)
|
||||
head = W
|
||||
updateicon()
|
||||
update_icon(UPDATE_OVERLAYS)
|
||||
else
|
||||
to_chat(user, "<span class='notice'>You need to attach a flash to it first!</span>")
|
||||
|
||||
|
||||
@@ -39,11 +39,11 @@
|
||||
/obj/item/borg/upgrade/proc/pre_install_checks(mob/living/silicon/robot/R)
|
||||
if(R.stat == DEAD)
|
||||
to_chat(usr, "<span class='warning'>[src] will not function on a deceased cyborg.</span>")
|
||||
return FALSE
|
||||
return
|
||||
if(module_type && !istype(R.module, module_type))
|
||||
to_chat(R, "<span class='warning'>Upgrade mounting error! No suitable hardpoint detected!</span>")
|
||||
to_chat(usr, "<span class='warning'>There's no mounting point for the module!</span>")
|
||||
return FALSE
|
||||
return
|
||||
return TRUE
|
||||
|
||||
/**
|
||||
@@ -99,7 +99,7 @@
|
||||
/obj/item/borg/upgrade/rename/do_install(mob/living/silicon/robot/R)
|
||||
if(!R.allow_rename)
|
||||
to_chat(R, "<span class='warning'>Internal diagnostic error: incompatible upgrade module detected.</span>")
|
||||
return 0
|
||||
return
|
||||
R.notify_ai(3, R.name, heldname)
|
||||
R.name = heldname
|
||||
R.custom_name = heldname
|
||||
@@ -116,7 +116,7 @@
|
||||
/obj/item/borg/upgrade/restart/do_install(mob/living/silicon/robot/R)
|
||||
if(R.health < 0)
|
||||
to_chat(usr, "<span class='warning'>You have to repair the cyborg before using this module!</span>")
|
||||
return 0
|
||||
return
|
||||
|
||||
if(!R.key)
|
||||
for(var/mob/dead/observer/ghost in GLOB.player_list)
|
||||
@@ -286,7 +286,7 @@
|
||||
var/obj/item/borg/upgrade/selfrepair/U = locate() in R
|
||||
if(U)
|
||||
to_chat(usr, "<span class='warning'>This unit is already equipped with a self-repair module.</span>")
|
||||
return 0
|
||||
return
|
||||
|
||||
cyborg = R
|
||||
icon_state = "selfrepair_off"
|
||||
@@ -308,9 +308,9 @@
|
||||
else
|
||||
to_chat(cyborg, "<span class='notice'>You deactivate the self-repair module.</span>")
|
||||
STOP_PROCESSING(SSobj, src)
|
||||
update_icon()
|
||||
update_icon(UPDATE_ICON_STATE)
|
||||
|
||||
/obj/item/borg/upgrade/selfrepair/update_icon()
|
||||
/obj/item/borg/upgrade/selfrepair/update_icon_state()
|
||||
if(cyborg)
|
||||
icon_state = "selfrepair_[on ? "on" : "off"]"
|
||||
for(var/X in actions)
|
||||
@@ -322,7 +322,7 @@
|
||||
/obj/item/borg/upgrade/selfrepair/proc/deactivate()
|
||||
STOP_PROCESSING(SSobj, src)
|
||||
on = FALSE
|
||||
update_icon()
|
||||
update_icon(UPDATE_ICON_STATE)
|
||||
|
||||
/obj/item/borg/upgrade/selfrepair/process()
|
||||
if(!repair_tick)
|
||||
|
||||
Reference in New Issue
Block a user