cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-30 00:35:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5284 from CHOMPStation2/upstream-merge-14103

Browse Source 
[MIRROR] Gives teshari missing hat + mask sprites.
This commit is contained in:
Nadyr
2022-11-21 23:40:32 -05:00
committed by GitHub
parent 4586e9373a 0b236f0065
commit 5286cfe64a
11 changed files with 24 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/head/misc_special_vr.dm
+4
View File
@@ -0,0 +1,4 @@
/obj/item/clothing/head/cone
sprite_sheets = list(
SPECIES_TESHARI = 'icons/inventory/head/mob_vr_teshari.dmi'
)
code/modules/clothing/head/misc_vr.dm
+5
View File
@@ -129,3 +129,8 @@
icon_override = 'icons/inventory/head/mob_vr.dmi'
icon_state = "beret_talon_officer"
item_state = "baret_talon_command"
/obj/item/clothing/head/cowboy
sprite_sheets = list(
SPECIES_TESHARI = 'icons/inventory/head/mob_vr_teshari.dmi'
)
code/modules/clothing/masks/gasmask_vr.dm
+6 -1
View File
@@ -17,4 +17,9 @@
icon = 'icons/inventory/face/item_vr.dmi'
icon_override = 'icons/inventory/face/mob_vr.dmi'
body_parts_covered = FACE|EYES
flags_inv = HIDEEARS|HIDEEYES|HIDEFACE
flags_inv = HIDEEARS|HIDEEYES|HIDEFACE
/obj/item/clothing/mask/gas/plaguedoctor
sprite_sheets = list(
SPECIES_TESHARI = 'icons/inventory/face/mob_vr_teshari.dmi'
)
code/modules/clothing/masks/miscellaneous_vr.dm
+4
View File
@@ -0,0 +1,4 @@
/obj/item/clothing/mask/emotions
sprite_sheets = list(
SPECIES_TESHARI = 'icons/inventory/face/mob_vr_teshari.dmi'
)
code/modules/clothing/suits/wiz_robe.dm
+3
View File
@@ -28,6 +28,9 @@
/obj/item/clothing/head/wizard/fake/realistic/colorable
desc = "A cool-looking 'magic' hat."
icon_state = "wizard-white"
sprite_sheets = list(
SPECIES_TESHARI = 'icons/inventory/head/mob_vr_teshari.dmi'
)
/obj/item/clothing/head/wizard/marisa
name = "Witch Hat"
icons/inventory/face/mob_vr_teshari.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 16 KiB

icons/inventory/head/mob_vr_teshari.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 12 KiB

modular_chomp/code/modules/clothing/face/gasmask.dm
-15
View File
@@ -1,15 +0,0 @@
/obj/item/clothing/mask/gas/plaguedoctor/New()
. = ..()
var/shtfound = sprite_sheets.Find(SPECIES_TESHARI)
if(shtfound)
sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/face/mob_teshari.dmi'
else
sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/face/mob_teshari.dmi'
/obj/item/clothing/mask/gas/plaguedoctor/gold/New()
. = ..()
var/shtfound = sprite_sheets.Find(SPECIES_TESHARI)
if(shtfound)
sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/face/mob_teshari.dmi'
else
sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/face/mob_teshari.dmi'
modular_chomp/code/modules/clothing/face/miscellaneous.dm
-7
View File
@@ -1,7 +0,0 @@
/obj/item/clothing/mask/emotions/New()
. = ..()
var/shtfound = sprite_sheets.Find(SPECIES_TESHARI)
if(shtfound)
sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/face/mob_teshari.dmi'
else
sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/face/mob_teshari.dmi'
modular_chomp/code/modules/clothing/head/misc.dm
-97
View File
@@ -1,97 +0,0 @@
//PLEASE give me a better way to do this
/obj/item/clothing/head/cone/New()
. = ..()
var/shtfound = sprite_sheets.Find(SPECIES_TESHARI)
if(shtfound)
sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/head/mob_teshari.dmi'
else
sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/head/mob_teshari.dmi'
/obj/item/clothing/head/wizard/fake/realistic/New()
. = ..()
var/shtfound = sprite_sheets.Find(SPECIES_TESHARI)
if(shtfound)
sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/head/mob_teshari.dmi'
else
sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/head/mob_teshari.dmi'
/obj/item/clothing/head/wizard/fake/realistic/colorable/New()
. = ..()
var/shtfound = sprite_sheets.Find(SPECIES_TESHARI)
if(shtfound)
sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/head/mob_teshari.dmi'
else
sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/head/mob_teshari.dmi'
/obj/item/clothing/head/cowboy/New()
. = ..()
var/shtfound = sprite_sheets.Find(SPECIES_TESHARI)
if(shtfound)
sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/head/mob_teshari.dmi'
else
sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/head/mob_teshari.dmi'
/obj/item/clothing/head/cowboy/rattan/New()
. = ..()
var/shtfound = sprite_sheets.Find(SPECIES_TESHARI)
if(shtfound)
sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/head/mob_teshari.dmi'
else
sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/head/mob_teshari.dmi'
/obj/item/clothing/head/cowboy/dark/New()
. = ..()
var/shtfound = sprite_sheets.Find(SPECIES_TESHARI)
if(shtfound)
sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/head/mob_teshari.dmi'
else
sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/head/mob_teshari.dmi'
/obj/item/clothing/head/cowboy/ranger/New()
. = ..()
var/shtfound = sprite_sheets.Find(SPECIES_TESHARI)
if(shtfound)
sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/head/mob_teshari.dmi'
else
sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/head/mob_teshari.dmi'
/obj/item/clothing/head/cowboy/black/New()
. = ..()
var/shtfound = sprite_sheets.Find(SPECIES_TESHARI)
if(shtfound)
sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/head/mob_teshari.dmi'
else
sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/head/mob_teshari.dmi'
/obj/item/clothing/head/cowboy/fancy/New()
. = ..()
var/shtfound = sprite_sheets.Find(SPECIES_TESHARI)
if(shtfound)
sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/head/mob_teshari.dmi'
else
sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/head/mob_teshari.dmi'
/obj/item/clothing/head/cowboy/rustler/New()
. = ..()
var/shtfound = sprite_sheets.Find(SPECIES_TESHARI)
if(shtfound)
sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/head/mob_teshari.dmi'
else
sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/head/mob_teshari.dmi'
/obj/item/clothing/head/cowboy/bandit/New()
. = ..()
var/shtfound = sprite_sheets.Find(SPECIES_TESHARI)
if(shtfound)
sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/head/mob_teshari.dmi'
else
sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/head/mob_teshari.dmi'
/obj/item/clothing/head/cowboy/wide/New()
. = ..()
var/shtfound = sprite_sheets.Find(SPECIES_TESHARI)
if(shtfound)
sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/head/mob_teshari.dmi'
else
sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/head/mob_teshari.dmi'
vorestation.dme
+2 -3
View File
@@ -2108,6 +2108,7 @@
#include "code\modules\clothing\head\misc.dm"
#include "code\modules\clothing\head\misc_ch.dm"
#include "code\modules\clothing\head\misc_special.dm"
#include "code\modules\clothing\head\misc_special_vr.dm"
#include "code\modules\clothing\head\misc_vr.dm"
#include "code\modules\clothing\head\pilot_helmet.dm"
#include "code\modules\clothing\head\pilot_helmet_vr.dm"
@@ -2121,6 +2122,7 @@
#include "code\modules\clothing\masks\gasmask_vr.dm"
#include "code\modules\clothing\masks\hailer.dm"
#include "code\modules\clothing\masks\miscellaneous.dm"
#include "code\modules\clothing\masks\miscellaneous_vr.dm"
#include "code\modules\clothing\masks\shiny_vr.dm"
#include "code\modules\clothing\masks\tesh_synth_facemask.dm"
#include "code\modules\clothing\masks\voice.dm"
@@ -4516,9 +4518,6 @@
#include "modular_chomp\code\modules\client\preferences_spawnpoints.dm"
#include "modular_chomp\code\modules\client\preference_setup\global\setting_datums.dm"
#include "modular_chomp\code\modules\clothing\clothing.dm"
#include "modular_chomp\code\modules\clothing\face\gasmask.dm"
#include "modular_chomp\code\modules\clothing\face\miscellaneous.dm"
#include "modular_chomp\code\modules\clothing\head\misc.dm"
#include "modular_chomp\code\modules\clothing\spacesuits\rig\clockwork_ch.dm"
#include "modular_chomp\code\modules\clothing\spacesuits\rig\rig.dm"
#include "modular_chomp\code\modules\datums\supplypacks\contraband.dm"