mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-28 22:47:59 +01:00
The Big Botany BResprite: Movement II, The Clothening (#29902)
* code and icons * file renaming * vendor prices, apron/overalls obj icons, species sprites * species head sprites because thats a thing * loadout inconsistencies fix * vox have their own apron and overalls sprites so i added those. oh the lengths i go for you botany * loadout 2: return of the inconsistencies Signed-off-by: Ahzpy <88119260+Ahzpy@users.noreply.github.com> * maybe fixes merge conflict? * merge conflicts are so annoying holy shit * sick of this dme junk * remove unrelated change Signed-off-by: Ahzpy <88119260+Ahzpy@users.noreply.github.com> * merge conflict test fix * super merge conflict fix * fix drask syndiberet * actually fixes drask syndiberet * super ultra final beret fix * Update loadout_uniform.dm --------- Signed-off-by: Ahzpy <88119260+Ahzpy@users.noreply.github.com>
This commit is contained in:
@@ -87,6 +87,16 @@
|
||||
path = /obj/item/clothing/head/soft/janitorpurple
|
||||
allowed_roles = list("Janitor")
|
||||
|
||||
/datum/gear/hat/caphydroblue
|
||||
display_name = "Cap, hydroponics blue"
|
||||
path = /obj/item/clothing/head/soft/hydroponics
|
||||
allowed_roles = list("Botanist")
|
||||
|
||||
/datum/gear/hat/caphydrobrown
|
||||
display_name = "Cap, hydroponics brown"
|
||||
path = /obj/item/clothing/head/soft/hydroponics_alt
|
||||
allowed_roles = list("Botanist")
|
||||
|
||||
/datum/gear/hat/capred
|
||||
display_name = "Cap, red"
|
||||
path = /obj/item/clothing/head/soft/red
|
||||
@@ -202,6 +212,16 @@
|
||||
path = /obj/item/clothing/head/beret/janitor
|
||||
allowed_roles = list("Janitor")
|
||||
|
||||
/datum/gear/hat/beret_job/hydroponics
|
||||
display_name = "Beret, hydroponics blue"
|
||||
path = /obj/item/clothing/head/beret/hydroponics
|
||||
allowed_roles = list("Botanist")
|
||||
|
||||
/datum/gear/hat/beret_job/hydroponics_alt
|
||||
display_name = "Beret, hydroponics brown"
|
||||
path = /obj/item/clothing/head/beret/hydroponics_alt
|
||||
allowed_roles = list("Botanist")
|
||||
|
||||
/datum/gear/hat/beret_job/hop
|
||||
display_name = "Beret, head of personnel"
|
||||
path = /obj/item/clothing/head/beret/hop
|
||||
|
||||
@@ -20,6 +20,10 @@
|
||||
/datum/gear/uniform/suit
|
||||
main_typepath = /datum/gear/uniform/suit
|
||||
|
||||
/datum/gear/uniform/suit/job
|
||||
main_typepath = /datum/gear/uniform/suit/job
|
||||
subtype_selection_cost = FALSE
|
||||
|
||||
/datum/gear/uniform/turtleneck
|
||||
main_typepath = /datum/gear/uniform/turtleneck
|
||||
|
||||
@@ -362,6 +366,12 @@
|
||||
allowed_roles = list("Head of Security")
|
||||
|
||||
//Service
|
||||
|
||||
/datum/gear/uniform/suit/job/hydroponics_alt
|
||||
display_name = "Jumpsuit, hydroponics brown"
|
||||
path = /obj/item/clothing/under/rank/civilian/hydroponics/alt
|
||||
allowed_roles = list("Botanist")
|
||||
|
||||
/datum/gear/uniform/skirt/job/clown
|
||||
display_name = "Skirt, clown"
|
||||
path = /obj/item/clothing/under/rank/civilian/clown/skirt
|
||||
|
||||
@@ -89,7 +89,7 @@
|
||||
icon_state = "beret_officer"
|
||||
armor = list(MELEE = 25, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 0, RAD = 0, FIRE = 10, ACID = 50)
|
||||
strip_delay = 60
|
||||
dog_fashion = /datum/dog_fashion/head/beret/sec
|
||||
dog_fashion = /datum/dog_fashion/head/beret/sec
|
||||
|
||||
/obj/item/clothing/head/beret/sec/corporate
|
||||
name = "corporate security beret"
|
||||
@@ -182,6 +182,26 @@
|
||||
"Kidan" = 'icons/mob/clothing/species/kidan/head/beret.dmi'
|
||||
)
|
||||
|
||||
/obj/item/clothing/head/beret/hydroponics
|
||||
name = "botany beret"
|
||||
desc = "A green beret with a blue service insignia emblazoned on it. It smells dizzying."
|
||||
icon_state = "beret_hydroponics"
|
||||
sprite_sheets = list(
|
||||
"Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi',
|
||||
"Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi',
|
||||
"Kidan" = 'icons/mob/clothing/species/kidan/head/beret.dmi'
|
||||
)
|
||||
|
||||
/obj/item/clothing/head/beret/hydroponics_alt
|
||||
name = "hydroponics beret"
|
||||
desc = "A green beret with a brown service insignia emblazoned on it. It smells dizzying."
|
||||
icon_state = "beret_hydroponics_alt"
|
||||
sprite_sheets = list(
|
||||
"Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi',
|
||||
"Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi',
|
||||
"Kidan" = 'icons/mob/clothing/species/kidan/head/beret.dmi'
|
||||
)
|
||||
|
||||
//Medical
|
||||
/obj/item/clothing/head/beret/cmo
|
||||
name = "chief medical officer's beret"
|
||||
|
||||
@@ -129,6 +129,18 @@
|
||||
icon_state = "janitorpurplesoft"
|
||||
item_color = "janitorpurple"
|
||||
|
||||
/obj/item/clothing/head/soft/hydroponics
|
||||
name = "botanist's cap"
|
||||
desc = "It's a green baseball hat with a blue service shield."
|
||||
icon_state = "hydroponicssoft"
|
||||
item_color = "hydroponics"
|
||||
|
||||
/obj/item/clothing/head/soft/hydroponics_alt
|
||||
name = "hydroponics cap"
|
||||
desc = "It's a green baseball hat with a brown service shield."
|
||||
icon_state = "hydroponics_altsoft"
|
||||
item_color = "hydroponics_alt"
|
||||
|
||||
/obj/item/clothing/head/soft/paramedic
|
||||
name = "\improper EMT cap"
|
||||
desc = "It's a blue baseball hat with a white medical shield."
|
||||
|
||||
@@ -139,13 +139,19 @@
|
||||
body_parts_covered = UPPER_TORSO|LOWER_TORSO
|
||||
|
||||
/obj/item/clothing/under/rank/civilian/hydroponics
|
||||
desc = "It's a jumpsuit designed to protect against minor plant-related hazards."
|
||||
desc = "It's a jumpsuit designed to protect against minor plant-related hazards. This one has blue markings."
|
||||
name = "botanist's jumpsuit"
|
||||
icon_state = "hydroponics"
|
||||
item_state = "g_suit"
|
||||
item_color = "hydroponics"
|
||||
permeability_coefficient = 0.50
|
||||
|
||||
/obj/item/clothing/under/rank/civilian/hydroponics/alt
|
||||
desc = "It's a jumpsuit designed to protect against minor plant-related hazards. This one has brown markings."
|
||||
name = "hydroponicist's jumpsuit"
|
||||
icon_state = "hydroponics_alt"
|
||||
item_color = "hydroponics_alt"
|
||||
|
||||
/obj/item/clothing/under/rank/civilian/janitor
|
||||
name = "janitor's jumpsuit"
|
||||
desc = "It's the official uniform of the station's janitor. It has minor protection from biohazards."
|
||||
|
||||
Reference in New Issue
Block a user