cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-16 09:34:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changes slot number defines from lowercase to all uppercase (#22297)

Browse Source 
* undo all of it

* flags

* back

* head/mask

* left

* right

* Cuffs

* other name changes

* ID and PDA

* idk about calling them SLOT_HUD now

* glasses, gloves, and shoes, oh my!

* the rest

* comment
This commit is contained in:
Contrabang
2023-10-03 13:27:51 -04:00
committed by GitHub
parent a6a34c2592
commit f3f9bd442a
219 changed files with 1114 additions and 1113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/topic.dm
+12 -12
View File
@@ -1140,8 +1140,8 @@
M.loc = prison_cell
if(ishuman(M))
var/mob/living/carbon/human/prisoner = M
prisoner.equip_to_slot_or_del(new /obj/item/clothing/under/color/orange(prisoner), slot_w_uniform)
prisoner.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(prisoner), slot_shoes)
prisoner.equip_to_slot_or_del(new /obj/item/clothing/under/color/orange(prisoner), SLOT_HUD_JUMPSUIT)
prisoner.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(prisoner), SLOT_HUD_SHOES)
to_chat(M, "<span class='warning'>You have been sent to the prison station!</span>")
log_admin("[key_name(usr)] sent [key_name(M)] to the prison station.")
@@ -1349,8 +1349,8 @@
if(ishuman(M))
var/mob/living/carbon/human/observer = M
observer.equip_to_slot_or_del(new /obj/item/clothing/under/suit(observer), slot_w_uniform)
observer.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(observer), slot_shoes)
observer.equip_to_slot_or_del(new /obj/item/clothing/under/suit(observer), SLOT_HUD_JUMPSUIT)
observer.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(observer), SLOT_HUD_SHOES)
if(isliving(M))
var/mob/living/L = M
L.Paralyse(10 SECONDS)
@@ -1786,9 +1786,9 @@
to_chat(usr, "<span class='warning'>This can only be used on instances of type /mob/living/carbon/human</span>")
return
H.equip_to_slot_or_del( new /obj/item/reagent_containers/food/snacks/cookie(H), slot_l_hand )
H.equip_to_slot_or_del( new /obj/item/reagent_containers/food/snacks/cookie(H), SLOT_HUD_LEFT_HAND )
if(!(istype(H.l_hand,/obj/item/reagent_containers/food/snacks/cookie)))
H.equip_to_slot_or_del( new /obj/item/reagent_containers/food/snacks/cookie(H), slot_r_hand )
H.equip_to_slot_or_del( new /obj/item/reagent_containers/food/snacks/cookie(H), SLOT_HUD_RIGHT_HAND )
if(!(istype(H.r_hand,/obj/item/reagent_containers/food/snacks/cookie)))
log_admin("[key_name(H)] has their hands full, so they did not receive their cookie, spawned by [key_name(src.owner)].")
message_admins("[key_name_admin(H)] has [H.p_their()] hands full, so [H.p_they()] did not receive [H.p_their()] cookie, spawned by [key_name_admin(src.owner)].")
@@ -2122,7 +2122,7 @@
evilcookie.bitesize = 100
evilcookie.flags = NODROP | DROPDEL
H.drop_l_hand()
H.equip_to_slot_or_del(evilcookie, slot_l_hand)
H.equip_to_slot_or_del(evilcookie, SLOT_HUD_LEFT_HAND)
logmsg = "a mutagen cookie."
if("Hellwater Cookie")
var/obj/item/reagent_containers/food/snacks/cookie/evilcookie = new /obj/item/reagent_containers/food/snacks/cookie
@@ -2131,7 +2131,7 @@
evilcookie.bitesize = 100
evilcookie.flags = NODROP | DROPDEL
H.drop_l_hand()
H.equip_to_slot_or_del(evilcookie, slot_l_hand)
H.equip_to_slot_or_del(evilcookie, SLOT_HUD_LEFT_HAND)
logmsg = "a hellwater cookie."
if("Hunter")
ADD_TRAIT(H, TRAIT_BADDNA, "smiting")
@@ -2178,7 +2178,7 @@
if(H.head)
H.unEquip(H.head, TRUE)
var/obj/item/clothing/head/sombrero/shamebrero/S = new(H.loc)
H.equip_to_slot_or_del(S, slot_head)
H.equip_to_slot_or_del(S, SLOT_HUD_HEAD)
logmsg = "shamebrero"
if(logmsg)
log_admin("[key_name(owner)] smited [key_name(M)] with: [logmsg]")
@@ -2906,8 +2906,8 @@
W.plane = initial(W.plane)
//teleport person to cell
H.loc = pick(GLOB.prisonwarp)
H.equip_to_slot_or_del(new /obj/item/clothing/under/color/orange(H), slot_w_uniform)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(H), slot_shoes)
H.equip_to_slot_or_del(new /obj/item/clothing/under/color/orange(H), SLOT_HUD_JUMPSUIT)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(H), SLOT_HUD_SHOES)
else
//teleport security person
H.loc = pick(GLOB.prisonsecuritywarp)
@@ -3467,7 +3467,7 @@
hunter_mind.transfer_to(hunter_mob)
hunter_mob.equipOutfit(O, FALSE)
var/obj/item/pinpointer/advpinpointer/N = new /obj/item/pinpointer/advpinpointer(hunter_mob)
hunter_mob.equip_to_slot_or_del(N, slot_in_backpack)
hunter_mob.equip_to_slot_or_del(N, SLOT_HUD_IN_BACKPACK)
N.mode = 3 //MODE_ADV, not defined here
N.setting = 2 //SETTING_OBJECT, not defined here
N.target = H