mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-13 03:33:21 +00:00
This should hopefully reduce processing requirements, by not rebuilding icons every tick.
(Ported oldcode, all props to Strumpetplaya)
This commit is contained in:
@@ -80,7 +80,6 @@
|
|||||||
#define FILE_DIR "code/game/objects/stacks"
|
#define FILE_DIR "code/game/objects/stacks"
|
||||||
#define FILE_DIR "code/game/objects/storage"
|
#define FILE_DIR "code/game/objects/storage"
|
||||||
#define FILE_DIR "code/game/objects/tanks"
|
#define FILE_DIR "code/game/objects/tanks"
|
||||||
#define FILE_DIR "code/game/structure"
|
|
||||||
#define FILE_DIR "code/game/verbs"
|
#define FILE_DIR "code/game/verbs"
|
||||||
#define FILE_DIR "code/js"
|
#define FILE_DIR "code/js"
|
||||||
#define FILE_DIR "code/modules"
|
#define FILE_DIR "code/modules"
|
||||||
@@ -724,7 +723,6 @@
|
|||||||
#include "code\game\objects\tanks\emergency.dm"
|
#include "code\game\objects\tanks\emergency.dm"
|
||||||
#include "code\game\objects\tanks\jetpack.dm"
|
#include "code\game\objects\tanks\jetpack.dm"
|
||||||
#include "code\game\objects\tanks\oxygen.dm"
|
#include "code\game\objects\tanks\oxygen.dm"
|
||||||
#include "code\game\structure\structure.dm"
|
|
||||||
#include "code\game\verbs\AI_status.dm"
|
#include "code\game\verbs\AI_status.dm"
|
||||||
#include "code\game\verbs\checkkarma.dm"
|
#include "code\game\verbs\checkkarma.dm"
|
||||||
#include "code\game\verbs\ooc.dm"
|
#include "code\game\verbs\ooc.dm"
|
||||||
|
|||||||
@@ -195,7 +195,8 @@ A list of items and costs is stored under the datum of every game mode, alongsid
|
|||||||
explode()
|
explode()
|
||||||
var/obj/item/weapon/implant/uplink/U = src.loc
|
var/obj/item/weapon/implant/uplink/U = src.loc
|
||||||
var/mob/living/A = U.imp_in
|
var/mob/living/A = U.imp_in
|
||||||
A.gib()
|
var/datum/organ/external/head = A:organs["head"]
|
||||||
|
head.take_damage(100, 0, 1)
|
||||||
..()
|
..()
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -482,6 +482,7 @@
|
|||||||
I.implanted = O
|
I.implanted = O
|
||||||
O.flavor_text = M.flavor_text
|
O.flavor_text = M.flavor_text
|
||||||
O.warn_flavor_changed()
|
O.warn_flavor_changed()
|
||||||
|
O.update_clothing()
|
||||||
del(M)
|
del(M)
|
||||||
return
|
return
|
||||||
//////////////////////////////////////////////////////////// Monkey Block
|
//////////////////////////////////////////////////////////// Monkey Block
|
||||||
|
|||||||
@@ -246,6 +246,7 @@ var/global/datum/controller/occupations/job_master
|
|||||||
var/obj/item/weapon/storage/backpack/BPK = new/obj/item/weapon/storage/backpack(H)
|
var/obj/item/weapon/storage/backpack/BPK = new/obj/item/weapon/storage/backpack(H)
|
||||||
H.equip_if_possible(BPK, H.slot_back,1)
|
H.equip_if_possible(BPK, H.slot_back,1)
|
||||||
H.equip_if_possible(new /obj/item/weapon/storage/box(H.back), H.slot_in_backpack)
|
H.equip_if_possible(new /obj/item/weapon/storage/box(H.back), H.slot_in_backpack)
|
||||||
|
H.update_clothing()
|
||||||
return 1
|
return 1
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -369,6 +369,11 @@ mob/proc/flash_weak_pain()
|
|||||||
|
|
||||||
if(istype(M, /mob/living/carbon/human))
|
if(istype(M, /mob/living/carbon/human))
|
||||||
M:attacked_by(src, user, def_zone)
|
M:attacked_by(src, user, def_zone)
|
||||||
|
var/mob/living/carbon/human/H = M
|
||||||
|
if(H)
|
||||||
|
H.UpdateDamageIcon()
|
||||||
|
H.update_clothing()
|
||||||
|
user.update_clothing()
|
||||||
else
|
else
|
||||||
switch(src.damtype)
|
switch(src.damtype)
|
||||||
if("brute")
|
if("brute")
|
||||||
|
|||||||
@@ -266,6 +266,7 @@ ZIPPO
|
|||||||
else
|
else
|
||||||
user.r_hand = W
|
user.r_hand = W
|
||||||
W.layer = 20
|
W.layer = 20
|
||||||
|
user.update_clothing()
|
||||||
else
|
else
|
||||||
return ..()
|
return ..()
|
||||||
src.update_icon()
|
src.update_icon()
|
||||||
|
|||||||
@@ -87,6 +87,7 @@
|
|||||||
|
|
||||||
spawn( 0 )
|
spawn( 0 )
|
||||||
O.process()
|
O.process()
|
||||||
|
user.update_clothing()
|
||||||
return
|
return
|
||||||
else
|
else
|
||||||
for(var/mob/O in viewers(M, null))
|
for(var/mob/O in viewers(M, null))
|
||||||
|
|||||||
@@ -29,6 +29,7 @@
|
|||||||
dropped(source)
|
dropped(source)
|
||||||
if (W)
|
if (W)
|
||||||
W.layer = initial(W.layer)
|
W.layer = initial(W.layer)
|
||||||
|
source.update_clothing()
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -69,6 +69,7 @@
|
|||||||
if (M.buckled == src)
|
if (M.buckled == src)
|
||||||
M.buckled = null
|
M.buckled = null
|
||||||
M.anchored = 0
|
M.anchored = 0
|
||||||
|
M.update_clothing()
|
||||||
|
|
||||||
/obj/structure/stool/proc/manual_unbuckle_all(mob/user as mob)
|
/obj/structure/stool/proc/manual_unbuckle_all(mob/user as mob)
|
||||||
var/N = 0;
|
var/N = 0;
|
||||||
@@ -87,6 +88,7 @@
|
|||||||
// world << "[M] is no longer buckled to [src]"
|
// world << "[M] is no longer buckled to [src]"
|
||||||
M.anchored = 0
|
M.anchored = 0
|
||||||
M.buckled = null
|
M.buckled = null
|
||||||
|
M.update_clothing()
|
||||||
N++
|
N++
|
||||||
return N
|
return N
|
||||||
|
|
||||||
@@ -109,6 +111,7 @@
|
|||||||
M.buckled = src
|
M.buckled = src
|
||||||
M.loc = src.loc
|
M.loc = src.loc
|
||||||
M.dir = src.dir
|
M.dir = src.dir
|
||||||
|
M.update_clothing()
|
||||||
src:buckled_mobs += M
|
src:buckled_mobs += M
|
||||||
src.add_fingerprint(user)
|
src.add_fingerprint(user)
|
||||||
return
|
return
|
||||||
@@ -339,6 +342,7 @@
|
|||||||
M.pixel_y = 0
|
M.pixel_y = 0
|
||||||
M.anchored = 0
|
M.anchored = 0
|
||||||
M.buckled = null
|
M.buckled = null
|
||||||
|
M.update_clothing()
|
||||||
N++
|
N++
|
||||||
if(N)
|
if(N)
|
||||||
density = 0
|
density = 0
|
||||||
|
|||||||
@@ -85,7 +85,7 @@
|
|||||||
handle_health_updates()
|
handle_health_updates()
|
||||||
|
|
||||||
// Update clothing
|
// Update clothing
|
||||||
update_clothing()
|
// update_clothing()
|
||||||
|
|
||||||
if(client)
|
if(client)
|
||||||
handle_regular_hud_updates()
|
handle_regular_hud_updates()
|
||||||
|
|||||||
@@ -474,6 +474,7 @@
|
|||||||
usr << "\blue You successfully remove your handcuffs."
|
usr << "\blue You successfully remove your handcuffs."
|
||||||
usr:handcuffed:loc = usr:loc
|
usr:handcuffed:loc = usr:loc
|
||||||
usr:handcuffed = null
|
usr:handcuffed = null
|
||||||
|
usr.update_clothing()
|
||||||
|
|
||||||
if(istype(usr, /mob/living/carbon/human) && istype(usr:wear_suit, /obj/item/clothing/suit/straight_jacket) && usr:canmove && (usr.last_special <= world.time))
|
if(istype(usr, /mob/living/carbon/human) && istype(usr:wear_suit, /obj/item/clothing/suit/straight_jacket) && usr:canmove && (usr.last_special <= world.time))
|
||||||
usr.next_move = world.time + 200
|
usr.next_move = world.time + 200
|
||||||
|
|||||||
Reference in New Issue
Block a user