cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Return of the neck slot! (#27188)

Browse Source 
* this turned out to be wayyyy more than just a test

* remove bedsheet icons from back.dmi

* hud+better icons

* error fixed

* fixes a few bedsheet icons

* Update code/game/objects/items/weapons/storage/garment.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Signed-off-by: Bm0n <92271472+Bm0n@users.noreply.github.com>

* review

* spacing

* TGUI Bundle Rebuild

* TGUI Bundle Rebuild

* TGUI Bundle Rebuild

* TGUI Bundle Rebuild

* lint?

* guh

* lint

* TGUI Bundle Rebuild

* test

* fix

* dead golem fix

* TGUI Bundle Rebuild

* TGUI Bundle Rebuild

* TGUI Bundle Rebuild

---------

Signed-off-by: Bm0n <92271472+Bm0n@users.noreply.github.com>
Co-authored-by: Bmon <no@email.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
This commit is contained in:
Bm0n
2024-11-27 17:04:53 +00:00
committed by GitHub
co-authored by Henri215 Bmon
parent 0a6425be7c
commit 6eb1269d8e
46 changed files with 226 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/action.dm
+4 -3
View File
@@ -616,6 +616,10 @@
var/obj/item/voice_changer/V = target
V.set_voice(usr)
/datum/action/item_action/herald
name = "Mirror Walk"
desc = "Use near a mirror to enter it."
// for clothing accessories like holsters
/datum/action/item_action/accessory
check_flags = AB_CHECK_RESTRAINED|AB_CHECK_STUNNED|AB_CHECK_LYING|AB_CHECK_CONSCIOUS
@@ -637,9 +641,6 @@
name = "View Storage"
/datum/action/item_action/accessory/herald
name = "Mirror Walk"
desc = "Use near a mirror to enter it."
//Preset for spells
/datum/action/spell_action
code/datums/outfits/outfit.dm
+8 -1
View File
@@ -10,6 +10,7 @@
var/shoes = null
var/head = null
var/mask = null
var/neck = null
var/l_ear = null
var/r_ear = null
var/glasses = null
@@ -85,6 +86,8 @@
equip_item(H, head, ITEM_SLOT_HEAD)
if(mask)
equip_item(H, mask, ITEM_SLOT_MASK)
if(neck)
equip_item(H, neck, ITEM_SLOT_NECK)
if(l_ear)
equip_item(H, l_ear, ITEM_SLOT_LEFT_EAR)
if(r_ear)
@@ -172,6 +175,8 @@
H.wear_suit.add_fingerprint(H, 1)
if(H.wear_mask)
H.wear_mask.add_fingerprint(H, 1)
if(H.neck)
H.neck.add_fingerprint(H, 1)
if(H.head)
H.head.add_fingerprint(H, 1)
if(H.shoes)
@@ -199,7 +204,7 @@
return 1
/datum/outfit/proc/get_chameleon_disguise_info()
var/list/types = list(uniform, suit, back, belt, gloves, shoes, head, mask, l_ear, r_ear, glasses, id, l_pocket, r_pocket, suit_store, r_hand, l_hand, pda)
var/list/types = list(uniform, suit, back, belt, gloves, shoes, head, mask, neck, l_ear, r_ear, glasses, id, l_pocket, r_pocket, suit_store, r_hand, l_hand, pda)
types += chameleon_extras
listclearnulls(types)
return types
@@ -225,6 +230,7 @@
shoes = text2path(outfit_data["shoes"])
head = text2path(outfit_data["head"])
mask = text2path(outfit_data["mask"])
neck = text2path(outfit_data["neck"])
l_ear = text2path(outfit_data["l_ear"])
r_ear = text2path(outfit_data["r_ear"])
glasses = text2path(outfit_data["glasses"])
@@ -281,6 +287,7 @@
.["shoes"] = shoes
.["head"] = head
.["mask"] = mask
.["neck"] = neck
.["l_ear"] = l_ear
.["r_ear"] = r_ear
.["glasses"] = glasses
code/datums/outfits/vv_outfit.dm
+3 -1
View File
@@ -27,6 +27,8 @@
head = item_path
if(ITEM_SLOT_MASK)
mask = item_path
if(ITEM_SLOT_NECK)
neck = item_path
if(ITEM_SLOT_LEFT_EAR)
l_ear = item_path
if(ITEM_SLOT_RIGHT_EAR)
@@ -70,7 +72,7 @@
// Copy equipment
var/list/result = list()
var/list/slots_to_check = list(ITEM_SLOT_JUMPSUIT, ITEM_SLOT_BACK, ITEM_SLOT_OUTER_SUIT, ITEM_SLOT_BELT, ITEM_SLOT_GLOVES, ITEM_SLOT_SHOES, ITEM_SLOT_HEAD, ITEM_SLOT_MASK, ITEM_SLOT_LEFT_EAR, ITEM_SLOT_RIGHT_EAR, ITEM_SLOT_EYES, ITEM_SLOT_ID, ITEM_SLOT_PDA, ITEM_SLOT_SUIT_STORE, ITEM_SLOT_LEFT_POCKET, ITEM_SLOT_RIGHT_POCKET)
var/list/slots_to_check = list(ITEM_SLOT_JUMPSUIT, ITEM_SLOT_BACK, ITEM_SLOT_OUTER_SUIT, ITEM_SLOT_BELT, ITEM_SLOT_GLOVES, ITEM_SLOT_SHOES, ITEM_SLOT_HEAD, ITEM_SLOT_MASK, ITEM_SLOT_LEFT_EAR, ITEM_SLOT_RIGHT_EAR, ITEM_SLOT_EYES, ITEM_SLOT_ID, ITEM_SLOT_PDA, ITEM_SLOT_SUIT_STORE, ITEM_SLOT_LEFT_POCKET, ITEM_SLOT_RIGHT_POCKET, ITEM_SLOT_NECK)
for(var/s in slots_to_check)
var/obj/item/I = get_item_by_slot(s)
var/vedits = collect_vv(I)