mirror of
https://github.com/KabKebab/GS13.git
synced 2026-06-03 21:28:45 +01:00
Merge branch 'KabKebab:master' into master
This commit is contained in:
Alphas00
@@ -50,10 +50,6 @@
|
||||
..()
|
||||
U = null
|
||||
|
||||
// /obj/item/clothing/suit/space/hardsuit/engine/haydee/jumpsuit_adjust() //when the user adjusts the clothes' style, rebuild the overlays
|
||||
// ..()
|
||||
// worn_overlays()
|
||||
|
||||
/obj/item/clothing/suit/space/hardsuit/engine/haydee/worn_overlays(isinhands = FALSE)
|
||||
if(U)
|
||||
if(!isinhands)
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
//most of those are probably recolors, but this is just generally GATO / GS13 stuff
|
||||
|
||||
/obj/item/clothing/head/helmet/space/hardsuit/ert/alert/gato
|
||||
name = "GATO Hardsuit Helmet"
|
||||
desc = "Exclusive version of a hardsuit helmet, usually reserved for GATO CC personnel."
|
||||
icon = 'GainStation13/icons/mob/head.dmi'
|
||||
alternate_worn_icon = 'GainStation13/icons/mob/head.dmi'
|
||||
icon_state = "hardsuit0-gato"
|
||||
item_state = "hardsuit0-gato"
|
||||
mutantrace_variation = NO_MUTANTRACE_VARIATION
|
||||
|
||||
/obj/item/clothing/head/HoS/beret/gato
|
||||
name = "GT-CC Beret"
|
||||
desc = "A robust beret for the CC personnel, for looking stylish while not sacrificing protection."
|
||||
icon = 'GainStation13/icons/mob/head.dmi'
|
||||
alternate_worn_icon = 'GainStation13/icons/mob/head.dmi'
|
||||
icon_state = "gato_beret"
|
||||
item_state = "gato_beret"
|
||||
mutantrace_variation = NO_MUTANTRACE_VARIATION
|
||||
|
||||
/obj/item/clothing/head/HoS/gato
|
||||
name = "GT-CC Cap"
|
||||
desc = "The robust standard-issue cap of the CC personnel."
|
||||
icon = 'GainStation13/icons/mob/head.dmi'
|
||||
alternate_worn_icon = 'GainStation13/icons/mob/head.dmi'
|
||||
icon_state = "gato_cap"
|
||||
item_state = "gato_cap"
|
||||
mutantrace_variation = NO_MUTANTRACE_VARIATION
|
||||
@@ -0,0 +1,66 @@
|
||||
//most of those are probably recolors, but this is just generally GATO / GS13 stuff
|
||||
|
||||
|
||||
/obj/item/clothing/suit/jacket/letterman_gato
|
||||
name = "GATO letterman jacket"
|
||||
desc = "A GATO themed letterman jacket. Perfect for repping your pride in the company as you violently murder russian mobsters"
|
||||
icon = 'GainStation13/icons/mob/suits.dmi'
|
||||
alternate_worn_icon = 'GainStation13/icons/mob/suits.dmi'
|
||||
icon_state = "letterman_gato"
|
||||
item_state = "letterman_gato"
|
||||
mutantrace_variation = NO_MUTANTRACE_VARIATION
|
||||
|
||||
/obj/item/clothing/suit/armor/vest/capcarapace/cc
|
||||
name = "Elegant Carapace"
|
||||
desc = "A fireproof armored chestpiece reinforced with ceramic plates and plasteel pauldrons to provide additional protection whilst still offering maximum mobility and flexibility. Issued only to the station's finest, although it does chafe your nipples."
|
||||
icon = 'GainStation13/icons/mob/suits.dmi'
|
||||
alternate_worn_icon = 'GainStation13/icons/mob/suits.dmi'
|
||||
icon_state = "cc_carapace"
|
||||
item_state = "cc_carapace"
|
||||
mutantrace_variation = NO_MUTANTRACE_VARIATION
|
||||
|
||||
/obj/item/clothing/suit/armor/vest/capcarapace/gato
|
||||
name = "CC-GT Carapace"
|
||||
desc = "A fireproof armored chestpiece reinforced with ceramic plates and plasteel pauldrons to provide additional protection whilst still offering maximum mobility and flexibility. Issued only to the station's finest, although it does chafe your nipples."
|
||||
icon = 'GainStation13/icons/mob/suits.dmi'
|
||||
alternate_worn_icon = 'GainStation13/icons/mob/suits.dmi'
|
||||
icon_state = "gato_carapace"
|
||||
item_state = "gato_carapace"
|
||||
mutantrace_variation = NO_MUTANTRACE_VARIATION
|
||||
|
||||
/obj/item/clothing/suit/armor/vest/capcarapace/moka
|
||||
name = "Hellcat Overcoat"
|
||||
desc = "Badass. Seems to be specifically made for some CentComm Commander."
|
||||
icon = 'GainStation13/icons/mob/suits.dmi'
|
||||
alternate_worn_icon = 'GainStation13/icons/mob/suits.dmi'
|
||||
icon_state = "hellcat_overcoat"
|
||||
item_state = "hellcat_overcoat"
|
||||
mutantrace_variation = NO_MUTANTRACE_VARIATION
|
||||
|
||||
/obj/item/clothing/suit/armor/vest/capcarapace/paradeblack
|
||||
name = "CC Parade Jacket"
|
||||
desc = "This elegant and highly protective parade jacket seems to have been made into color purple."
|
||||
icon = 'GainStation13/icons/mob/suits.dmi'
|
||||
alternate_worn_icon = 'GainStation13/icons/mob/suits.dmi'
|
||||
icon_state = "paradejacket_black"
|
||||
item_state = "paradejacket_black"
|
||||
mutantrace_variation = NO_MUTANTRACE_VARIATION
|
||||
|
||||
/obj/item/clothing/suit/armor/vest/capcarapace/paradepurple
|
||||
name = "CC Parade Jacket"
|
||||
desc = "This elegant and highly protective parade jacket seems to have been made into color purple."
|
||||
icon = 'GainStation13/icons/mob/suits.dmi'
|
||||
alternate_worn_icon = 'GainStation13/icons/mob/suits.dmi'
|
||||
icon_state = "paradejacket_purple"
|
||||
item_state = "paradejacket_purple"
|
||||
mutantrace_variation = NO_MUTANTRACE_VARIATION
|
||||
|
||||
/obj/item/clothing/suit/space/hardsuit/ert/alert/gato
|
||||
name = "GATO Hardsuit"
|
||||
desc = "Exclusive variant of a hardsuit, primarily reserved for CC GATO personnel."
|
||||
icon = 'GainStation13/icons/mob/suits.dmi'
|
||||
alternate_worn_icon = 'GainStation13/icons/mob/suits.dmi'
|
||||
icon_state = "gato_hardsuit"
|
||||
item_state = "gato_hardsuit"
|
||||
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/alert/gato
|
||||
mutantrace_variation = NO_MUTANTRACE_VARIATION
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 863 B |
Binary file not shown.
|
After Width: | Height: | Size: 3.8 KiB |
@@ -309,7 +309,7 @@
|
||||
"cbt" = (/obj/structure/table/reinforced,/obj/machinery/recharger,/obj/effect/turf_decal/stripes/line{dir = 1},/turf/open/floor/plasteel,/area/centcom/control)
|
||||
"ccn" = (/obj/machinery/computer/shuttle,/turf/open/floor/engine/cult,/area/wizard_station)
|
||||
"ccq" = (/obj/machinery/conveyor/inverted{dir = 9; id = "fatfacility_cargo_left"},/turf/open/floor/mineral/calorite,/area/fatlab)
|
||||
"ccS" = (/obj/structure/closet/cabinet,/obj/item/clothing/suit/armor/hos/trenchcoat,/obj/item/clothing/suit/armor/hos/trenchcoat,/obj/item/clothing/shoes/jackboots/tall,/obj/item/clothing/gloves/combat,/obj/item/clothing/neck/cloak/centcom,/obj/item/clothing/shoes/combat/swat,/obj/item/clothing/mask/chameleon,/obj/machinery/light/small{dir = 1},/obj/item/clothing/accessory/medal/gato_badge/employee,/turf/open/floor/plasteel/dark/side{dir = 9},/area/centcom/ferry)
|
||||
"ccS" = (/obj/structure/closet/cabinet,/obj/item/clothing/suit/armor/hos/trenchcoat,/obj/item/clothing/suit/armor/hos/trenchcoat,/obj/item/clothing/shoes/jackboots/tall,/obj/item/clothing/gloves/combat,/obj/item/clothing/neck/cloak/centcom,/obj/item/clothing/shoes/combat/swat,/obj/item/clothing/mask/chameleon,/obj/machinery/light/small{dir = 1},/obj/item/clothing/accessory/medal/gato_badge/employee,/obj/item/clothing/head/HoS/beret/gato,/obj/item/clothing/head/HoS/gato,/obj/item/clothing/suit/space/hardsuit/ert/alert/gato,/obj/item/clothing/suit/armor/vest/capcarapace/gato,/obj/item/clothing/suit/armor/vest/capcarapace/paradepurple,/obj/item/clothing/suit/armor/vest/capcarapace/paradeblack,/obj/item/clothing/under/centcomdress,/obj/item/clothing/under/centcomdressvk,/turf/open/floor/plasteel/dark/side{dir = 9},/area/centcom/ferry)
|
||||
"cdu" = (/obj/structure/table/wood{layer = 3.3},/obj/item/twohanded/required/kirbyplants{icon_state = "plant-05"; pixel_y = 4},/turf/open/floor/holofloor{dir = 9; icon_state = "wood"},/area/holodeck/rec_center/lounge)
|
||||
"cdA" = (/obj/effect/turf_decal/tile/blue{dir = 4},/obj/effect/turf_decal/tile/blue{dir = 8},/turf/open/floor/plasteel/white,/area/centcom/control)
|
||||
"cdF" = (/obj/structure/bed,/turf/open/floor/mineral/titanium/blue,/area/centcom/evac)
|
||||
@@ -728,7 +728,7 @@
|
||||
"fnj" = (/obj/structure/table/wood,/turf/open/floor/holofloor{dir = 9; icon_state = "wood"},/area/holodeck/rec_center/lounge)
|
||||
"fnB" = (/obj/machinery/light{dir = 1},/turf/open/floor/plasteel/grimy,/area/centcom/ferry)
|
||||
"fow" = (/obj/machinery/hydroponics/constructable,/obj/effect/turf_decal/tile/green{dir = 1},/obj/effect/turf_decal/tile/green,/obj/effect/turf_decal/tile/green{dir = 4},/obj/effect/turf_decal/tile/green{dir = 8},/turf/open/floor/plasteel/white,/area/centcom/holding)
|
||||
"fpb" = (/obj/structure/closet/secure_closet/personal/cabinet,/obj/item/clothing/under/rank/curator/treasure_hunter,/obj/item/clothing/under/skirt/black,/obj/item/clothing/under/shorts/black,/obj/item/clothing/under/pants/track,/obj/item/clothing/accessory/armband/deputy,/obj/item/clothing/accessory/waistcoat,/obj/item/clothing/shoes/jackboots,/obj/item/clothing/shoes/laceup,/obj/item/clothing/neck/stripedredscarf,/obj/item/clothing/neck/tie/red,/obj/item/clothing/head/helmet/space/beret,/obj/item/clothing/suit/curator,/obj/item/clothing/suit/space/officer,/obj/item/clothing/gloves/fingerless,/obj/item/clothing/gloves/color/black,/obj/item/clothing/glasses/eyepatch,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/item/clothing/accessory/medal/gato_badge/employee,/turf/open/floor/plasteel/grimy,/area/centcom/ferry)
|
||||
"fpb" = (/obj/structure/closet/secure_closet/personal/cabinet,/obj/item/clothing/under/rank/curator/treasure_hunter,/obj/item/clothing/under/skirt/black,/obj/item/clothing/under/shorts/black,/obj/item/clothing/under/pants/track,/obj/item/clothing/accessory/armband/deputy,/obj/item/clothing/accessory/waistcoat,/obj/item/clothing/shoes/jackboots,/obj/item/clothing/shoes/laceup,/obj/item/clothing/neck/stripedredscarf,/obj/item/clothing/neck/tie/red,/obj/item/clothing/head/helmet/space/beret,/obj/item/clothing/suit/curator,/obj/item/clothing/suit/space/officer,/obj/item/clothing/gloves/fingerless,/obj/item/clothing/gloves/color/black,/obj/item/clothing/glasses/eyepatch,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/item/clothing/accessory/medal/gato_badge/employee,/obj/item/clothing/suit/armor/vest/capcarapace/paradeblack,/obj/item/clothing/suit/armor/vest/capcarapace/paradepurple,/obj/item/clothing/head/HoS/gato,/obj/item/clothing/head/HoS/beret/gato,/obj/item/clothing/suit/armor/vest/capcarapace/gato,/obj/item/clothing/suit/armor/vest/capcarapace/cc,/obj/item/clothing/under/centcomdress,/obj/item/clothing/under/centcomdressvk,/turf/open/floor/plasteel/grimy,/area/centcom/ferry)
|
||||
"fpm" = (/obj/machinery/abductor/console{team_number = 4},/turf/open/floor/plating/abductor,/area/abductor_ship)
|
||||
"fpx" = (/obj/machinery/vending/snack,/turf/open/floor/engine/cult,/area/wizard_station)
|
||||
"fpS" = (/obj/structure/flora/ausbushes/fernybush,/obj/structure/flora/ausbushes/fullgrass,/obj/structure/flora/ausbushes/palebush,/obj/structure/window/reinforced/fulltile,/turf/open/floor/grass,/area/centcom/holding)
|
||||
@@ -2619,7 +2619,7 @@
|
||||
"sEN" = (/obj/effect/turf_decal/stripes/line{dir = 1},/turf/open/floor/plasteel,/area/fatlab)
|
||||
"sFA" = (/obj/machinery/newscaster/security_unit{pixel_y = -32},/obj/machinery/computer/cargo{dir = 1},/obj/effect/turf_decal/stripes/line{dir = 9},/turf/open/floor/plasteel,/area/centcom/supply)
|
||||
"sFU" = (/obj/machinery/rnd/production/techfab/department/medical,/obj/effect/turf_decal/tile/blue{dir = 4},/obj/effect/turf_decal/tile/blue,/turf/open/floor/plasteel/white,/area/fatlab)
|
||||
"sGs" = (/obj/structure/chair/comfy/black{dir = 8},/obj/machinery/light/small{dir = 1},/turf/open/floor/wood,/area/centcom/ferry)
|
||||
"sGs" = (/obj/structure/chair/comfy/black{dir = 8},/obj/machinery/light/small{dir = 1},/obj/item/clothing/suit/armor/vest/capcarapace/moka,/turf/open/floor/wood,/area/centcom/ferry)
|
||||
"sGQ" = (/obj/machinery/light{dir = 4},/obj/effect/turf_decal/tile/green,/obj/effect/turf_decal/tile/green{dir = 4},/turf/open/floor/plasteel,/area/tdome/tdomeobserve)
|
||||
"sHy" = (/obj/structure/table,/obj/item/gun/energy/laser,/turf/open/floor/holofloor/asteroid,/area/holodeck/rec_center/bunker)
|
||||
"sHA" = (/obj/item/storage/firstaid/regular{pixel_x = 3; pixel_y = -3},/obj/item/storage/firstaid/fire{pixel_x = 3; pixel_y = 3},/obj/item/storage/firstaid/fire,/obj/item/storage/firstaid/fire{pixel_x = -3; pixel_y = -3},/obj/structure/table/glass,/obj/effect/turf_decal/tile/blue{dir = 4},/obj/effect/turf_decal/tile/blue,/obj/machinery/light{dir = 4},/turf/open/floor/plasteel/white,/area/fatlab)
|
||||
@@ -2662,7 +2662,7 @@
|
||||
"sSN" = (/obj/machinery/recharger{pixel_y = 4},/obj/effect/landmark/thunderdome/two,/obj/effect/turf_decal/delivery,/turf/open/floor/plasteel,/area/tdome/arena)
|
||||
"sSO" = (/obj/machinery/light,/obj/effect/turf_decal/tile/green{dir = 1},/obj/effect/turf_decal/tile/green,/obj/effect/turf_decal/tile/green{dir = 4},/obj/effect/turf_decal/tile/green{dir = 8},/turf/open/floor/plasteel/white,/area/centcom/holding)
|
||||
"sSV" = (/obj/effect/turf_decal/tile/red{dir = 8},/obj/effect/turf_decal/tile/red{dir = 4},/obj/effect/turf_decal/tile/red,/obj/item/twohanded/required/kirbyplants,/turf/open/floor/plasteel,/area/fatlab)
|
||||
"sTk" = (/obj/structure/table/reinforced,/obj/item/clothing/suit/space/hardsuit/deathsquad{pixel_y = 5},/obj/item/clothing/gloves/combat,/obj/item/clothing/shoes/combat/swat,/obj/item/clothing/mask/gas/sechailer/swat,/obj/effect/turf_decal/stripes/line,/turf/open/floor/plasteel,/area/centcom/ferry)
|
||||
"sTk" = (/obj/structure/table/reinforced,/obj/item/clothing/suit/space/hardsuit/deathsquad{pixel_y = 5},/obj/item/clothing/gloves/combat,/obj/item/clothing/shoes/combat/swat,/obj/item/clothing/mask/gas/sechailer/swat,/obj/effect/turf_decal/stripes/line,/obj/item/clothing/suit/space/hardsuit/ert/alert/gato,/turf/open/floor/plasteel,/area/centcom/ferry)
|
||||
"sTU" = (/obj/effect/landmark/ai_multicam_room,/turf/open/ai_visible,/area/ai_multicam_room)
|
||||
"sUc" = (/obj/effect/turf_decal/tile/blue,/obj/effect/turf_decal/tile/blue{dir = 4},/obj/effect/turf_decal/stripes/line{dir = 4},/obj/effect/turf_decal/stripes/white/line{dir = 4},/turf/open/floor/plasteel/white,/area/fatlab)
|
||||
"sUz" = (/obj/machinery/computer/card/centcom,/obj/machinery/light{dir = 1},/turf/open/floor/plasteel/dark,/area/centcom/ferry)
|
||||
|
||||
@@ -517,12 +517,6 @@
|
||||
icon_state = "letterman_s"
|
||||
item_state = "letterman_s"
|
||||
|
||||
/obj/item/clothing/suit/jacket/letterman_gato // GS13
|
||||
name = "GATO letterman jacket"
|
||||
desc = "A GATO themed letterman jacket. Perfect for repping your pride in the company as you violently murder russian mobsters"
|
||||
icon_state = "letterman_gato"
|
||||
item_state = "letterman_gato"
|
||||
|
||||
/obj/item/clothing/suit/jacket/letterman_nanotrasen
|
||||
name = "blue letterman jacket"
|
||||
desc = "A blue letterman jacket with a proud Nanotrasen N on the back. The tag says that it was made in Space China."
|
||||
|
||||
@@ -3074,6 +3074,8 @@
|
||||
#include "GainStation13\code\clothing\accessory.dm"
|
||||
#include "GainStation13\code\clothing\calorite_collar.dm"
|
||||
#include "GainStation13\code\clothing\haydee_suit.dm"
|
||||
#include "GainStation13\code\clothing\head.dm"
|
||||
#include "GainStation13\code\clothing\suits.dm"
|
||||
#include "GainStation13\code\datums\components\fattening_door.dm"
|
||||
#include "GainStation13\code\datums\mutations\fatfang.dm"
|
||||
#include "GainStation13\code\datums\status_effects\fatstun.dm"
|
||||
|
||||
Reference in New Issue
Block a user