mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-28 22:47:59 +01:00
Cleanup of all the update_clothing() calls.
Mostly I replaced them with rebuild_appearance() or update_body_appearance() where suitable. I also reorganized the new update_clothing() code a bit.
This commit is contained in:
@@ -338,7 +338,7 @@
|
||||
del(fingerprints)
|
||||
if(istype(src, /mob/living/carbon/human))
|
||||
var/mob/living/carbon/human/M = src
|
||||
M.update_clothing()
|
||||
M.rebuild_appearance() // both clothes and hands need to be cleaned, so just rebuild all
|
||||
return
|
||||
|
||||
/atom/MouseDrop(atom/over_object as mob|obj|turf|area)
|
||||
|
||||
+6
-12
@@ -547,7 +547,7 @@
|
||||
if (W==H.w_uniform) // will be teared
|
||||
continue
|
||||
H.drop_from_slot(W)
|
||||
M.update_clothing()
|
||||
M.rebuild_appearance()
|
||||
M.monkeyizing = 1
|
||||
M.canmove = 0
|
||||
M.icon = null
|
||||
@@ -604,7 +604,7 @@
|
||||
O.a_intent = "hurt"
|
||||
O.flavor_text = M.flavor_text
|
||||
O.warn_flavor_changed()
|
||||
O.update_clothing()
|
||||
O.rebuild_appearance()
|
||||
del(M)
|
||||
return
|
||||
|
||||
@@ -615,7 +615,7 @@
|
||||
if(!connected)
|
||||
for(var/obj/item/W in (Mo.contents))
|
||||
Mo.drop_from_slot(W)
|
||||
M.update_clothing()
|
||||
M.rebuild_appearance()
|
||||
M.monkeyizing = 1
|
||||
M.canmove = 0
|
||||
M.icon = null
|
||||
@@ -681,12 +681,12 @@
|
||||
O.stat = M.stat
|
||||
O.flavor_text = M.flavor_text
|
||||
O.warn_flavor_changed()
|
||||
O.update_clothing()
|
||||
O.rebuild_appearance()
|
||||
del(M)
|
||||
return
|
||||
//////////////////////////////////////////////////////////// Monkey Block
|
||||
if (M)
|
||||
M.update_clothing()
|
||||
M.rebuild_appearance()
|
||||
return null
|
||||
/////////////////////////// DNA MISC-PROCS
|
||||
|
||||
@@ -790,13 +790,7 @@
|
||||
/obj/machinery/dna_scannernew/proc/go_out()
|
||||
if ((!( src.occupant ) || src.locked))
|
||||
return
|
||||
/*
|
||||
// it's like this was -just- here to break constructed dna scanners -Pete
|
||||
// if that's not the case, slap my shit and uncomment this.
|
||||
// for(var/obj/O in src)
|
||||
// O.loc = src.loc
|
||||
*/
|
||||
//Foreach goto(30)
|
||||
|
||||
if (src.occupant.client)
|
||||
src.occupant.client.eye = src.occupant.client.mob
|
||||
src.occupant.client.perspective = MOB_PERSPECTIVE
|
||||
|
||||
@@ -260,7 +260,7 @@
|
||||
if (istype(W, /obj/item/weapon/implant))
|
||||
implants += W
|
||||
|
||||
usr.update_clothing()
|
||||
usr.rebuild_appearance()
|
||||
usr.monkeyizing = 1
|
||||
usr.canmove = 0
|
||||
usr.icon = null
|
||||
@@ -346,7 +346,7 @@
|
||||
for (var/obj/item/weapon/implant/I in usr) //Still preserving implants
|
||||
implants += I
|
||||
|
||||
usr.update_clothing()
|
||||
usr.rebuild_appearance()
|
||||
usr.monkeyizing = 1
|
||||
usr.canmove = 0
|
||||
usr.icon = null
|
||||
@@ -414,7 +414,7 @@
|
||||
return
|
||||
for(var/obj/item/W in src)
|
||||
usr.drop_from_slot(W)
|
||||
usr.update_clothing()
|
||||
usr.rebuild_appearance()
|
||||
usr.monkeyizing = 1
|
||||
usr.canmove = 0
|
||||
usr.icon = null
|
||||
|
||||
@@ -105,7 +105,7 @@
|
||||
icon_state = "table2-active"
|
||||
return 1
|
||||
if(victim)
|
||||
victim.update_clothing()
|
||||
victim.update_lying()
|
||||
victim = null
|
||||
if(updatesicon)
|
||||
icon_state = "table2-idle"
|
||||
@@ -134,7 +134,7 @@
|
||||
if(updatesicon)
|
||||
icon_state = "table2-active"
|
||||
src.victim = M
|
||||
M.update_clothing()
|
||||
M.update_lying()
|
||||
processing_objects.Add(src)
|
||||
del(W)
|
||||
return
|
||||
|
||||
@@ -371,7 +371,6 @@
|
||||
"\red You hear a whine as \the [src]'s is hit by something dense.")
|
||||
H.UpdateDamageIcon()
|
||||
H.updatehealth()
|
||||
H.update_clothing()
|
||||
playsound(src.loc, 'tablehit1.ogg', 50, 1, -3)
|
||||
else //Lets do REAL DAMAGE, YEAH!
|
||||
G.affecting.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been smashed on a table by [G.assailant.name] ([G.assailant.ckey])</font>")
|
||||
@@ -410,7 +409,6 @@
|
||||
"\red You hear the nauseating crunch of bone and gristle on solid metal.")
|
||||
H.UpdateDamageIcon()
|
||||
H.updatehealth()
|
||||
H.update_clothing()
|
||||
playsound(src.loc, 'tablehit1.ogg', 50, 1, -3)
|
||||
return
|
||||
G.affecting.loc = src.loc
|
||||
|
||||
@@ -795,7 +795,7 @@ var/list/sacrificed = list()
|
||||
return fizzle()
|
||||
cultist.loc = src.loc
|
||||
cultist.lying = 1
|
||||
cultist.update_clothing()
|
||||
cultist.update_lying()
|
||||
for(var/mob/living/carbon/human/C in orange(1,src))
|
||||
if(iscultist(C))
|
||||
C.say("N'ath reth sh'yro eth d'rekkathnor!")
|
||||
|
||||
@@ -150,7 +150,7 @@ var/const
|
||||
layer = 20
|
||||
target.wear_mask = src
|
||||
|
||||
target.update_clothing()
|
||||
target.rebuild_appearance()
|
||||
|
||||
GoIdle() //so it doesn't jump the people that tear it off
|
||||
|
||||
|
||||
@@ -8,7 +8,6 @@
|
||||
/obj/item/weapon/bedsheet/attack_self(mob/user as mob)
|
||||
user.drop_item()
|
||||
src.layer = 5
|
||||
user.update_clothing()
|
||||
add_fingerprint(user)
|
||||
return
|
||||
|
||||
|
||||
@@ -184,7 +184,7 @@
|
||||
if ((!( istype(M, /mob) ) || get_dist(src, user) > 1 || M.loc != src.loc || user.restrained() || usr.stat || M.buckled || istype(usr, /mob/living/silicon/pai)))
|
||||
return
|
||||
M.pixel_y = 6
|
||||
M.update_clothing()
|
||||
M.update_lying()
|
||||
density = 1
|
||||
icon_state = "up"
|
||||
..()
|
||||
|
||||
@@ -111,16 +111,6 @@ TABLE AND RACK OBJECT INTERATIONS
|
||||
new /obj/item/weapon/table_parts( src.loc )
|
||||
src.density = 0
|
||||
del(src)
|
||||
/* if (user.mutations2 & mSmallsize)
|
||||
step(user, get_dir(user, src))
|
||||
if (user.loc == src.loc)
|
||||
user.layer = TURF_LAYER
|
||||
user.update_clothing()
|
||||
for(var/mob/M in viewers(user, null))
|
||||
M.show_message("[user] hides under the table!", 1)
|
||||
//Foreach goto(69)
|
||||
*/
|
||||
//Googol never tested this shit.
|
||||
return
|
||||
|
||||
|
||||
@@ -189,7 +179,6 @@ TABLE AND RACK OBJECT INTERATIONS
|
||||
"\red You hear the nauseating crunch of bone and gristle on solid metal.")
|
||||
H.UpdateDamageIcon()
|
||||
H.updatehealth()
|
||||
H.update_clothing()
|
||||
playsound(src.loc, 'tablehit1.ogg', 50, 1, -3)
|
||||
return
|
||||
G.affecting.loc = src.loc
|
||||
|
||||
@@ -170,9 +170,7 @@ proc/trigger_armed_response_team(var/force = 0)
|
||||
M.gender = MALE
|
||||
else
|
||||
M.gender = FEMALE
|
||||
M.update_body()
|
||||
M.update_face()
|
||||
M.update_clothing()
|
||||
M.rebuild_appearance()
|
||||
|
||||
M.real_name = commando_name
|
||||
M.name = commando_name
|
||||
|
||||
Reference in New Issue
Block a user