cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 21:18:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Repaths /obj/item/clothing/mask/animal/rat to make more sense [MDB IGNORE] (#13558)

Browse Source 
* Repaths `/obj/item/clothing/mask/animal/rat` to make more sense (#66860)

* Repaths `/obj/item/clothing/mask/animal/rat` to make more sense
It was used as the parent for a lot of other small animal masks simply
because of its flags and a single proc, so i repathed it to
`/obj/item/cltohing/mask/animal/small/...` to make more sense

* adds an updatepaths

* fixes the got damned maps

* Repaths `/obj/item/clothing/mask/animal/rat` to make more sense

* Repaths `/obj/item/clothing/mask/animal/rat` to make more sense

Co-authored-by: Seth Scherer <supernovaa41@gmx.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
This commit is contained in:
SkyratBot
2022-05-17 21:25:29 +01:00
committed by GitHub
co-authored by Seth Scherer Tom
parent db2db37bc3
commit af93d350cc
13 changed files with 103 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/KiloStation/KiloStation.dmm
+33 -2
View File
@@ -41886,11 +41886,11 @@
pixel_x = 6
},
/obj/item/clothing/neck/tie/red,
/obj/item/clothing/mask/animal/rat/jackal{
/obj/item/clothing/mask/animal/small/jackal{
pixel_x = 4;
pixel_y = 4
},
/obj/item/clothing/mask/animal/rat/jackal,
/obj/item/clothing/mask/animal/small/jackal,
/obj/structure/spider/stickyweb,
/obj/machinery/button/door/directional/west{
id = "bank";
@@ -49943,6 +49943,37 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/service/kitchen)
"nZt" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/stripes/corner{
dir = 8
},
/obj/structure/table,
/obj/effect/decal/cleanable/cobweb,
/obj/item/clothing/under/rank/civilian/lawyer/black{
pixel_x = 4;
pixel_y = 4
},
/obj/item/clothing/under/rank/civilian/lawyer/black,
/obj/item/clothing/neck/tie/black{
pixel_x = 6
},
/obj/item/clothing/neck/tie/red,
/obj/item/clothing/mask/animal/small/jackal,
/obj/item/clothing/mask/animal/small/jackal,
/obj/structure/spider/stickyweb,
/obj/machinery/button/door/directional/west{
id = "bank";
name = "Bank Vault Lock";
normaldoorcontrol = 1;
specialfunctions = 4
},
/turf/open/floor/iron/dark,
/area/station/maintenance/port/greater)
"nZC" = (
/obj/effect/turf_decal/bot,
/obj/structure/punching_bag,
_maps/map_files/KiloStation/KiloStation_skyrat.dmm
+2 -2
View File
@@ -72989,11 +72989,11 @@
pixel_x = 6
},
/obj/item/clothing/neck/tie/red,
/obj/item/clothing/mask/animal/rat/jackal{
/obj/item/clothing/mask/animal/small/jackal{
pixel_x = 4;
pixel_y = 4
},
/obj/item/clothing/mask/animal/rat/jackal,
/obj/item/clothing/mask/animal/small/jackal,
/obj/structure/spider/stickyweb,
/obj/machinery/button/door/directional/west{
id = "bank";
_maps/map_files/KiloStation/skyrat_old/KiloStation_skyrat_old.dmm
+3 -3
View File
@@ -70012,11 +70012,11 @@
pixel_x = 6
},
/obj/item/clothing/neck/tie/red,
/obj/item/clothing/mask/animal/rat/jackal{
/obj/item/clothing/mask/animal/small/jackal{
pixel_x = 4;
pixel_y = 4
},
/obj/item/clothing/mask/animal/rat/jackal,
/obj/item/clothing/mask/animal/small/jackal,
/obj/structure/spider/stickyweb,
/obj/machinery/button/door/directional/west{
id = "bank";
@@ -74533,7 +74533,7 @@
"ute" = (
/obj/machinery/computer/turbine_computer{
dir = 4;
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/delivery,
_maps/map_files/generic/CentCom.dmm
+1 -1
View File
@@ -1353,7 +1353,7 @@
/obj/structure/table/wood/fancy/royalblue,
/obj/item/clothing/mask/animal/pig,
/obj/item/clothing/mask/animal/horsehead,
/obj/item/clothing/mask/animal/rat,
/obj/item/clothing/mask/animal/small/rat,
/obj/item/clothing/mask/fakemoustache{
pixel_y = 9
},
_maps/map_files/generic/CentCom_skyrat.dmm
+1 -1
View File
@@ -15965,7 +15965,7 @@
/obj/structure/table/wood/fancy/royalblue,
/obj/item/clothing/mask/animal/pig,
/obj/item/clothing/mask/animal/horsehead,
/obj/item/clothing/mask/animal/rat,
/obj/item/clothing/mask/animal/small,
/obj/item/clothing/mask/fakemoustache{
pixel_y = 9
},
code/_globalvars/phobias.dm
+1 -1
View File
@@ -421,7 +421,7 @@ GLOBAL_LIST_INIT(phobia_objs, list(
)),
"insects" = typecacheof(list(
/obj/item/clothing/mask/animal/rat/bee,
/obj/item/clothing/mask/animal/small/bee,
/obj/item/clothing/suit/hooded/bee_costume,
/obj/item/toy/plush/beeplushie,
/obj/item/toy/plush/moth,
code/game/objects/items/storage/uplink_kits.dm
+1 -1
View File
@@ -216,7 +216,7 @@
if(KIT_BEES)
new /obj/item/paper/fluff/bee_objectives(src) // 0 tc (motivation)
new /obj/item/clothing/suit/hooded/bee_costume(src) // 0 tc
new /obj/item/clothing/mask/animal/rat/bee(src) // 0 tc
new /obj/item/clothing/mask/animal/small/bee(src) // 0 tc
new /obj/item/storage/belt/fannypack/yellow(src) // 0 tc
new /obj/item/grenade/spawnergrenade/buzzkill(src)
new /obj/item/grenade/spawnergrenade/buzzkill(src)
code/modules/clothing/masks/animal_masks.dm
+32 -28
View File
@@ -4,13 +4,13 @@ GLOBAL_LIST_INIT(cursed_animal_masks, list(
/obj/item/clothing/mask/animal/frog/cursed,
/obj/item/clothing/mask/animal/cowmask/cursed,
/obj/item/clothing/mask/animal/horsehead/cursed,
/obj/item/clothing/mask/animal/rat/cursed,
/obj/item/clothing/mask/animal/rat/fox/cursed,
/obj/item/clothing/mask/animal/rat/bee/cursed,
/obj/item/clothing/mask/animal/rat/bear/cursed,
/obj/item/clothing/mask/animal/rat/bat/cursed,
/obj/item/clothing/mask/animal/rat/raven/cursed,
/obj/item/clothing/mask/animal/rat/jackal/cursed
/obj/item/clothing/mask/animal/small/rat/cursed,
/obj/item/clothing/mask/animal/small/fox/cursed,
/obj/item/clothing/mask/animal/small/bee/cursed,
/obj/item/clothing/mask/animal/small/bear/cursed,
/obj/item/clothing/mask/animal/small/bat/cursed,
/obj/item/clothing/mask/animal/small/raven/cursed,
/obj/item/clothing/mask/animal/small/jackal/cursed
))
/obj/item/clothing/mask/animal
@@ -155,23 +155,27 @@ GLOBAL_LIST_INIT(cursed_animal_masks, list(
/obj/item/clothing/mask/animal/horsehead/cursed
cursed = TRUE
/obj/item/clothing/mask/animal/rat
/obj/item/clothing/mask/animal/small
name = "A small animal mask"
desc = "If you're seeing this, yell at a coder."
flags_inv = HIDEFACE|HIDESNOUT
/obj/item/clothing/mask/animal/small/make_cursed()
flags_inv = NONE
return ..()
/obj/item/clothing/mask/animal/small/rat
name = "rat mask"
desc = "A mask made of soft vinyl and latex, representing the head of a rat."
animal_type = "rat"
icon_state = "rat"
inhand_icon_state = "rat"
flags_inv = HIDEFACE|HIDESNOUT
animal_sounds = list("Skree!","SKREEE!","Squeak!")
/obj/item/clothing/mask/animal/rat/make_cursed()
flags_inv = NONE
return ..()
/obj/item/clothing/mask/animal/rat/cursed
/obj/item/clothing/mask/animal/small/rat/cursed
cursed = TRUE
/obj/item/clothing/mask/animal/rat/fox
/obj/item/clothing/mask/animal/small/fox
name = "fox mask"
desc = "A mask made of soft vinyl and latex, representing the head of a fox."
animal_type = "fox"
@@ -179,10 +183,10 @@ GLOBAL_LIST_INIT(cursed_animal_masks, list(
inhand_icon_state = "fox"
animal_sounds = list("Ack-Ack!","Ack-Ack-Ack-Ackawoooo!","Geckers!","AWOO!","TCHOFF!")
/obj/item/clothing/mask/animal/rat/fox/cursed
/obj/item/clothing/mask/animal/small/fox/cursed
cursed = TRUE
/obj/item/clothing/mask/animal/rat/bee
/obj/item/clothing/mask/animal/small/bee
name = "bee mask"
desc = "A mask made of soft vinyl and latex, representing the head of a bee."
animal_type = "bee"
@@ -190,10 +194,10 @@ GLOBAL_LIST_INIT(cursed_animal_masks, list(
inhand_icon_state = "bee"
animal_sounds = list("BZZT!", "BUZZZ!", "B-zzzz!", "Bzzzzzzttttt!")
/obj/item/clothing/mask/animal/rat/bee/cursed
/obj/item/clothing/mask/animal/small/bee/cursed
cursed = TRUE
/obj/item/clothing/mask/animal/rat/bear
/obj/item/clothing/mask/animal/small/bear
name = "bear mask"
desc = "A mask made of soft vinyl and latex, representing the head of a bear."
animal_type = "bear"
@@ -201,21 +205,21 @@ GLOBAL_LIST_INIT(cursed_animal_masks, list(
inhand_icon_state = "bear"
animal_sounds = list("RAWR!","Rawr!","GRR!","Growl!")
/obj/item/clothing/mask/animal/rat/bear/cursed
/obj/item/clothing/mask/animal/small/bear/cursed
cursed = TRUE
/obj/item/clothing/mask/animal/rat/bat
/obj/item/clothing/mask/animal/small/bat
name = "bat mask"
desc = "A mask made of soft vinyl and latex, representing the head of a bat."
animal_type = "bat"
icon_state = "bat"
inhand_icon_state = "bat"
/obj/item/clothing/mask/animal/rat/bat/cursed
/obj/item/clothing/mask/animal/small/bat/cursed
cursed = TRUE
/obj/item/clothing/mask/animal/rat/raven
/obj/item/clothing/mask/animal/small/raven
name = "raven mask"
desc = "A mask made of soft vinyl and latex, representing the head of a raven."
icon_state = "raven"
@@ -225,10 +229,10 @@ GLOBAL_LIST_INIT(cursed_animal_masks, list(
animal_sounds_alt = list("Nevermore...")
animal_sounds_alt_probability = 1
/obj/item/clothing/mask/animal/rat/raven/cursed
/obj/item/clothing/mask/animal/small/raven/cursed
cursed = TRUE
/obj/item/clothing/mask/animal/rat/jackal
/obj/item/clothing/mask/animal/small/jackal
name = "jackal mask"
desc = "A mask made of soft vinyl and latex, representing the head of a jackal."
animal_type = "jackal"
@@ -236,10 +240,10 @@ GLOBAL_LIST_INIT(cursed_animal_masks, list(
inhand_icon_state = "jackal"
animal_sounds = list("YAP!", "Woof!", "Bark!", "AUUUUUU!")
/obj/item/clothing/mask/animal/rat/jackal/cursed
/obj/item/clothing/mask/animal/small/jackal/cursed
cursed = TRUE
/obj/item/clothing/mask/animal/rat/tribal
/obj/item/clothing/mask/animal/small/tribal
name = "tribal mask"
desc = "A mask carved out of wood, detailed carefully by hand."
animal_type = "tribal" //honk.
@@ -249,5 +253,5 @@ GLOBAL_LIST_INIT(cursed_animal_masks, list(
animal_sounds_alt = list("Eekum-bokum!", "Oomenacka!", "In mah head..... Zombi.... Zombi!")
animal_sounds_alt_probability = 5
/obj/item/clothing/mask/animal/rat/tribal/cursed //adminspawn only.
/obj/item/clothing/mask/animal/small/tribal/cursed //adminspawn only.
cursed = TRUE
code/modules/holiday/holidays.dm
+3 -3
View File
@@ -279,7 +279,7 @@
name = "Bee Day"
begin_day = 20
begin_month = MAY
drone_hat = /obj/item/clothing/mask/animal/rat/bee
drone_hat = /obj/item/clothing/mask/animal/small/bee
/datum/holiday/bee/getStationPrefix()
return pick("Bee","Honey","Hive","Africanized","Mead","Buzz")
@@ -414,7 +414,7 @@
/datum/holiday/indigenous/getStationPrefix()
return pick("Endangered language", "Word", "Language", "Language revitalization", "Potato", "Corn")
// AUGUST
/datum/holiday/ukraine
@@ -611,7 +611,7 @@
name = "Mayan Doomsday Anniversary"
begin_day = 21
begin_month = DECEMBER
drone_hat = /obj/item/clothing/mask/animal/rat/tribal
drone_hat = /obj/item/clothing/mask/animal/small/tribal
/datum/holiday/xmas
name = CHRISTMAS
code/modules/mob_spawn/corpses/mob_corpses.dm
+1 -1
View File
@@ -219,4 +219,4 @@
belt = /obj/item/storage/belt/fannypack/yellow/bee_terrorist
id = /obj/item/card/id/advanced
l_pocket = /obj/item/paper/fluff/bee_objectives
mask = /obj/item/clothing/mask/animal/rat/bee
mask = /obj/item/clothing/mask/animal/small/bee
code/modules/vending/autodrobe.dm
+8 -8
View File
@@ -77,15 +77,15 @@
/obj/item/clothing/mask/gas/sexymime = 1,
/obj/item/clothing/under/rank/civilian/mime/sexy = 1,
/obj/item/clothing/under/rank/civilian/mime/skirt = 1,
/obj/item/clothing/mask/animal/rat/bat = 1,
/obj/item/clothing/mask/animal/rat/bee = 1,
/obj/item/clothing/mask/animal/rat/bear = 1,
/obj/item/clothing/mask/animal/rat/raven = 1,
/obj/item/clothing/mask/animal/rat/jackal = 1,
/obj/item/clothing/mask/animal/rat/fox = 1,
/obj/item/clothing/mask/animal/small/bat = 1,
/obj/item/clothing/mask/animal/small/bee = 1,
/obj/item/clothing/mask/animal/small/bear = 1,
/obj/item/clothing/mask/animal/small/raven = 1,
/obj/item/clothing/mask/animal/small/jackal = 1,
/obj/item/clothing/mask/animal/small/fox = 1,
/obj/item/clothing/mask/animal/frog = 1,
/obj/item/clothing/mask/animal/rat/tribal = 1,
/obj/item/clothing/mask/animal/rat = 1,
/obj/item/clothing/mask/animal/small/tribal = 1,
/obj/item/clothing/mask/animal/small/rat = 1,
/obj/item/clothing/mask/animal/pig = 1,
/obj/item/clothing/mask/animal/cowmask = 1,
/obj/item/clothing/mask/animal/horsehead = 1,
modular_skyrat/modules/moretraitoritems/code/syndicate_loadout.dm
+1 -1
View File
@@ -131,7 +131,7 @@
/obj/item/storage/box/syndie_kit/loadout/bee/PopulateContents()
new /obj/item/clothing/suit/hooded/bee_costume(src)
new /obj/item/clothing/mask/animal/rat/bee(src)
new /obj/item/clothing/mask/animal/small/bee(src)
new /obj/item/storage/belt/fannypack/yellow(src)
new /obj/item/grenade/spawnergrenade/buzzkill(src)
new /obj/item/grenade/spawnergrenade/buzzkill(src)
tools/UpdatePaths/replace_masks.txt
+16
View File
@@ -0,0 +1,16 @@
#comment This replaces animal mask paths to the new simplified paths see (https://github.com/tgstation/tgstation/pull/66860)
/obj/item/clothing/mask/animal/rat/cursed : /obj/item/clothing/mask/animal/small/rat/cursed
/obj/item/clothing/mask/animal/rat/fox/cursed : /obj/item/clothing/mask/animal/small/fox/cursed
/obj/item/clothing/mask/animal/rat/bee/cursed : /obj/item/clothing/mask/animal/small/bee/cursed
/obj/item/clothing/mask/animal/rat/bear/cursed : /obj/item/clothing/mask/animal/small/bear/cursed
/obj/item/clothing/mask/animal/rat/bat/cursed : /obj/item/clothing/mask/animal/small/bat/cursed
/obj/item/clothing/mask/animal/rat/raven/cursed : /obj/item/clothing/mask/animal/small/raven/cursed
/obj/item/clothing/mask/animal/rat/jackal/cursed : /obj/item/clothing/mask/animal/small/jackal/cursed
/obj/item/clothing/mask/animal/rat : /obj/item/clothing/mask/animal/small/rat
/obj/item/clothing/mask/animal/rat/fox : /obj/item/clothing/mask/animal/small/fox
/obj/item/clothing/mask/animal/rat/bee : /obj/item/clothing/mask/animal/small/bee
/obj/item/clothing/mask/animal/rat/bear : /obj/item/clothing/mask/animal/small/bear
/obj/item/clothing/mask/animal/rat/bat : /obj/item/clothing/mask/animal/small/bat
/obj/item/clothing/mask/animal/rat/raven : /obj/item/clothing/mask/animal/small/raven
/obj/item/clothing/mask/animal/rat/jackal : /obj/item/clothing/mask/animal/small/jackal