From 56a45a3990fcd666e52c555ba1910b444d9fd998 Mon Sep 17 00:00:00 2001 From: Molnia <161384279+molnizz@users.noreply.github.com> Date: Sat, 27 Jul 2024 01:34:27 +0500 Subject: [PATCH 1/2] Add: Elysium outfit --- .../_mod_celadon/configs/elysium_aldaama.json | 4 +- _maps/_mod_celadon/configs/elysium_homa.json | 14 ++-- .../configs/elysium_iron_maiden.json | 4 +- .../_mod_celadon/configs/elysium_kondor.json | 4 +- .../outpost/nanotrasen_asteroid.dmm | 18 +++-- .../shuttles/elysium/elysium_iron_maiden.dmm | 1 - .../shuttles/solfed/solfed_saber.dmm | 30 ++++--- mod_celadon/faction/code/faction.dm | 33 -------- .../solgov_outfit/code/solgov_outfit.dm | 4 - mod_celadon/stuff_elysium/_stuff_elysium.dme | 1 + .../stuff_elysium/code/outfit_ship/elysium.dm | 78 +++++++++++++++++++ mod_celadon/stuff_elysium/code/outfits.dm | 2 +- mod_celadon/stuff_elysium/code/shoes.dm | 5 ++ 13 files changed, 128 insertions(+), 70 deletions(-) create mode 100644 mod_celadon/stuff_elysium/code/outfit_ship/elysium.dm diff --git a/_maps/_mod_celadon/configs/elysium_aldaama.json b/_maps/_mod_celadon/configs/elysium_aldaama.json index 6e24bd324188..6c9cec426b81 100644 --- a/_maps/_mod_celadon/configs/elysium_aldaama.json +++ b/_maps/_mod_celadon/configs/elysium_aldaama.json @@ -19,7 +19,7 @@ "limit": 1, "job_slots": { "Caid": { - "outfit": "/datum/outfit/job/elysium/assistant", + "outfit": "/datum/outfit/job/elysium/captain", "officer": true, "slots": 1 }, @@ -28,7 +28,7 @@ "slots": 3 }, "Mukatell": { - "outfit": "/datum/outfit/job/elysium/assistant", + "outfit": "/datum/outfit/job/elysium/security", "slots" : 2 } }, diff --git a/_maps/_mod_celadon/configs/elysium_homa.json b/_maps/_mod_celadon/configs/elysium_homa.json index 82f9d07fde92..882785d2aaa5 100644 --- a/_maps/_mod_celadon/configs/elysium_homa.json +++ b/_maps/_mod_celadon/configs/elysium_homa.json @@ -16,20 +16,16 @@ ], "limit": 1, "job_slots": { - "Captain": { - "outfit": "/datum/outfit/job/elysium/assistant", + "Caid": { + "outfit": "/datum/outfit/job/elysium/captain", "officer": true, "slots": 1 }, - "Ship Engineer-Miner": { - "outfit": "/datum/outfit/job/elysium/assistant", + "Mukatell": { + "outfit": "/datum/outfit/job/elysium/security", "slots": 2 }, - "Ship's Doctor": { - "outfit": "/datum/outfit/job/elysium/assistant", - "slots": 1 - }, - "Scribe": { + "Ahisa`i": { "outfit": "/datum/outfit/job/elysium/assistant", "slots" : 2 } diff --git a/_maps/_mod_celadon/configs/elysium_iron_maiden.json b/_maps/_mod_celadon/configs/elysium_iron_maiden.json index e877dcb40230..5b8c73e34240 100644 --- a/_maps/_mod_celadon/configs/elysium_iron_maiden.json +++ b/_maps/_mod_celadon/configs/elysium_iron_maiden.json @@ -17,7 +17,7 @@ "limit": 1, "job_slots": { "Caid": { - "outfit": "/datum/outfit/job/elysium/assistant", + "outfit": "/datum/outfit/job/elysium/captain", "officer": true, "slots": 1 }, @@ -26,7 +26,7 @@ "slots": 3 }, "Mukatell": { - "outfit": "/datum/outfit/job/elysium/assistant", + "outfit": "/datum/outfit/job/elysium/security", "slots": 2 } }, diff --git a/_maps/_mod_celadon/configs/elysium_kondor.json b/_maps/_mod_celadon/configs/elysium_kondor.json index 28d5b5d08769..817e355f39c3 100644 --- a/_maps/_mod_celadon/configs/elysium_kondor.json +++ b/_maps/_mod_celadon/configs/elysium_kondor.json @@ -16,7 +16,7 @@ "limit": 2, "job_slots": { "Каид": { - "outfit": "/datum/outfit/job/elysium/assistant", + "outfit": "/datum/outfit/job/elysium/captain", "officer": true, "slots": 1 }, @@ -25,7 +25,7 @@ "slots": 1 }, "Мукатэлл": { - "outfit": "/datum/outfit/job/elysium/assistant", + "outfit": "/datum/outfit/job/elysium/security", "slots" : 2 } }, diff --git a/_maps/_mod_celadon/outpost/nanotrasen_asteroid.dmm b/_maps/_mod_celadon/outpost/nanotrasen_asteroid.dmm index 5d1492ba2860..db889ff32d78 100644 --- a/_maps/_mod_celadon/outpost/nanotrasen_asteroid.dmm +++ b/_maps/_mod_celadon/outpost/nanotrasen_asteroid.dmm @@ -227,7 +227,8 @@ /obj/effect/turf_decal/spline/fancy/opaque/black, /obj/machinery/firealarm/directional/north, /obj/item/banner/elysium{ - pixel_x = 5 + pixel_x = 5; + anchored = 1 }, /turf/open/floor/plasteel/dark, /area/outpost/hallway/fore) @@ -2677,7 +2678,8 @@ /obj/effect/turf_decal/spline/fancy/opaque/black, /obj/item/radio/intercom/directional/north, /obj/item/banner/elysium{ - pixel_x = 3 + pixel_x = 3; + anchored = 1 }, /turf/open/floor/plasteel/dark, /area/outpost/hallway/fore) @@ -6617,7 +6619,8 @@ dir = 8 }, /obj/item/banner/elysium{ - pixel_x = 6 + pixel_x = 6; + anchored = 1 }, /turf/open/floor/plasteel/dark, /area/outpost/operations) @@ -6832,7 +6835,8 @@ dir = 4 }, /obj/item/banner/elysium{ - pixel_x = 2 + pixel_x = 2; + anchored = 1 }, /turf/open/floor/concrete/tiles, /area/outpost/crew/garden) @@ -9047,7 +9051,8 @@ dir = 4 }, /obj/item/banner/elysium{ - pixel_x = 2 + pixel_x = 2; + anchored = 1 }, /turf/open/floor/plasteel/dark, /area/outpost/operations) @@ -14150,7 +14155,8 @@ dir = 1 }, /obj/item/banner/elysium{ - pixel_x = 6 + pixel_x = 6; + anchored = 1 }, /turf/open/floor/concrete/tiles, /area/outpost/crew/garden) diff --git a/_maps/_mod_celadon/shuttles/elysium/elysium_iron_maiden.dmm b/_maps/_mod_celadon/shuttles/elysium/elysium_iron_maiden.dmm index 8a52d0b09694..d7753933e19b 100644 --- a/_maps/_mod_celadon/shuttles/elysium/elysium_iron_maiden.dmm +++ b/_maps/_mod_celadon/shuttles/elysium/elysium_iron_maiden.dmm @@ -676,7 +676,6 @@ /obj/item/clothing/suit/space/elysm/junk, /obj/item/clothing/head/space/elysm/space_helm, /obj/item/clothing/mask/breath, -/obj/item/clothing/mask/bandana/black, /turf/open/floor/plasteel/mono/dark, /area/ship/cargo) "ye" = ( diff --git a/_maps/_mod_celadon/shuttles/solfed/solfed_saber.dmm b/_maps/_mod_celadon/shuttles/solfed/solfed_saber.dmm index a09c608c5460..33d7e26e5af1 100644 --- a/_maps/_mod_celadon/shuttles/solfed/solfed_saber.dmm +++ b/_maps/_mod_celadon/shuttles/solfed/solfed_saber.dmm @@ -49,7 +49,8 @@ pixel_y = -4 }, /obj/item/banner/elysium{ - pixel_x = 4 + pixel_x = 4; + anchored = 1 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/plasteel/dark, @@ -382,7 +383,8 @@ }, /obj/item/banner/elysium{ pixel_x = 4; - morale_cooldown = 50000 + morale_cooldown = 50000; + anchored = 1 }, /obj/effect/turf_decal/steeldecal/steel_decals1, /turf/open/floor/plasteel/mono/dark, @@ -3061,7 +3063,8 @@ "xY" = ( /obj/item/banner/elysium{ pixel_x = 4; - morale_cooldown = 50000 + morale_cooldown = 50000; + anchored = 1 }, /obj/effect/turf_decal/siding/thinplating/dark{ dir = 9 @@ -3489,7 +3492,8 @@ "Bs" = ( /obj/effect/turf_decal/industrial/outline/yellow, /obj/item/banner/solfed{ - morale_cooldown = 50000 + morale_cooldown = 50000; + anchored = 1 }, /turf/open/floor/plasteel/mono/dark, /area/ship/crew/office) @@ -3934,7 +3938,8 @@ "Ei" = ( /obj/item/banner/elysium{ pixel_x = 4; - morale_cooldown = 4000 + morale_cooldown = 4000; + anchored = 1 }, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/box/red, @@ -4012,7 +4017,8 @@ }, /obj/machinery/light/directional/north, /obj/item/banner/solfed{ - morale_cooldown = 50000 + morale_cooldown = 50000; + anchored = 1 }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood/walnut, @@ -4287,7 +4293,8 @@ }, /obj/item/banner/elysium{ pixel_x = 4; - morale_cooldown = 50000 + morale_cooldown = 50000; + anchored = 1 }, /turf/open/floor/plasteel/tech/grid, /area/ship/hallway/central) @@ -4766,7 +4773,8 @@ dir = 5 }, /obj/item/banner/solfed{ - morale_cooldown = 50000 + morale_cooldown = 50000; + anchored = 1 }, /turf/open/floor/carpet/green, /area/ship/security/range) @@ -6038,7 +6046,8 @@ dir = 4 }, /obj/item/banner/solfed{ - morale_cooldown = 50000 + morale_cooldown = 50000; + anchored = 1 }, /turf/open/floor/plasteel/tech/grid, /area/ship/hallway/central) @@ -6293,7 +6302,8 @@ "XM" = ( /obj/item/banner/elysium{ pixel_x = 4; - morale_cooldown = 50000 + morale_cooldown = 50000; + anchored = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/effect/turf_decal/spline/fancy/wood{ diff --git a/mod_celadon/faction/code/faction.dm b/mod_celadon/faction/code/faction.dm index 673ba8b79b01..782e4b063cea 100644 --- a/mod_celadon/faction/code/faction.dm +++ b/mod_celadon/faction/code/faction.dm @@ -4,39 +4,6 @@ H.faction |= list(FACTION_PLAYER_SYNDICATE,FACTION_ANTAG_SYNDICATE) // Elysium -/datum/outfit/job/elysium/assistant - name = "Elysium - Assistant" - job_icon = "captain" - jobtype = /datum/job/captain - - uniform = /obj/item/clothing/under/utility - shoes = /obj/item/clothing/shoes/sneakers/black - box = /obj/item/storage/box/survival - id = /obj/item/card/id/silver - -/datum/outfit/job/elysium/proc/get_elysium_access(mob/living/carbon/human/H) - var/obj/item/storage/wallet/W = null - for (var/obj/item/O in H.contents) - if (istype(O, /obj/item/storage/wallet)) - W = O - break - if (W) - var/obj/item/card/id/I = null - for (var/obj/item/O in W.contents) - if (istype(O, /obj/item/card/id/silver)) - I = O - break - if (I) - I.access = list(ACCESS_MAINT_TUNNELS) - I.update_label() - W.combined_access = list() - for (var/obj/item/card/id/card in W.contents) - W.combined_access |= card.access - -/datum/outfit/job/elysium/assistant/post_equip(mob/living/carbon/human/H) - . = ..() - get_elysium_access(H) - /datum/outfit/job/elysium/post_equip(mob/living/carbon/human/H) H.faction |= list(FACTION_PLAYER_ELYSIUM) diff --git a/mod_celadon/solgov_outfit/code/solgov_outfit.dm b/mod_celadon/solgov_outfit/code/solgov_outfit.dm index 9c5de34c429c..63a4a6c3c981 100644 --- a/mod_celadon/solgov_outfit/code/solgov_outfit.dm +++ b/mod_celadon/solgov_outfit/code/solgov_outfit.dm @@ -3,7 +3,6 @@ // // /datum/outfit/job/solgov/proc/get_solfed_captain_access(mob/living/carbon/human/H) - H.faction |= list(FACTION_PLAYER_SOLGOV) var/obj/item/storage/wallet/W = null for (var/obj/item/O in H.contents) if (istype(O, /obj/item/storage/wallet)) @@ -23,7 +22,6 @@ W.combined_access |= card.access /datum/outfit/job/solgov/proc/get_solfed_overseer_access(mob/living/carbon/human/H) - H.faction |= list(FACTION_PLAYER_SOLGOV) var/obj/item/storage/wallet/W = null for (var/obj/item/O in H.contents) if (istype(O, /obj/item/storage/wallet)) @@ -43,7 +41,6 @@ W.combined_access |= card.access /datum/outfit/job/solgov/proc/get_solfed_sonnensoldner_access(mob/living/carbon/human/H) - H.faction |= list(FACTION_PLAYER_SOLGOV) var/obj/item/storage/wallet/W = null for (var/obj/item/O in H.contents) if (istype(O, /obj/item/storage/wallet)) @@ -63,7 +60,6 @@ W.combined_access |= card.access /datum/outfit/job/solgov/proc/get_solfed_engineer_access(mob/living/carbon/human/H) - H.faction |= list(FACTION_PLAYER_SOLGOV) var/obj/item/storage/wallet/W = null for (var/obj/item/O in H.contents) if (istype(O, /obj/item/storage/wallet)) diff --git a/mod_celadon/stuff_elysium/_stuff_elysium.dme b/mod_celadon/stuff_elysium/_stuff_elysium.dme index 1e0357e98cc1..5e3cb4dc7006 100644 --- a/mod_celadon/stuff_elysium/_stuff_elysium.dme +++ b/mod_celadon/stuff_elysium/_stuff_elysium.dme @@ -12,6 +12,7 @@ #include "code/outfits.dm" #include "code/shoes.dm" #include "code/belt.dm" +#include "code/outfit_ship/elysium.dm" #endif diff --git a/mod_celadon/stuff_elysium/code/outfit_ship/elysium.dm b/mod_celadon/stuff_elysium/code/outfit_ship/elysium.dm new file mode 100644 index 000000000000..dcf3c5d486eb --- /dev/null +++ b/mod_celadon/stuff_elysium/code/outfit_ship/elysium.dm @@ -0,0 +1,78 @@ +/datum/outfit/job/elysium + name = "Elysium - Base Outfit" + job_icon = "captain" + jobtype = /datum/job/captain + + backpack = null + head = /obj/item/clothing/head/shemag/green + uniform = /obj/item/clothing/under/color/darkgreen + shoes = /obj/item/clothing/shoes/sneakers/black + id = /obj/item/card/id/silver + +/datum/outfit/job/elysium/proc/get_elysium_access(mob/living/carbon/human/H) + var/obj/item/storage/wallet/W = null + for (var/obj/item/O in H.contents) + if (istype(O, /obj/item/storage/wallet)) + W = O + break + if (W) + var/obj/item/card/id/I = null + for (var/obj/item/O in W.contents) + if (istype(O, /obj/item/card/id/silver)) + I = O + break + if (I) + I.access = list(ACCESS_MAINT_TUNNELS) + I.update_label() + W.combined_access = list() + for (var/obj/item/card/id/card in W.contents) + W.combined_access |= card.access + +/datum/outfit/job/elysium/captain + name = "Elysium - Caid" + job_icon = "captain" + jobtype = /datum/job/captain + + backpack = /obj/item/storage/backpack/satchel/leather + gloves = /obj/item/clothing/gloves/fingerless + back = /obj/item/storage/backpack/satchel/leather + uniform = /obj/item/clothing/under/color/darkgreen + shoes = /obj/item/clothing/shoes/sneakers/sandals + +/datum/outfit/job/elysium/captain/post_equip(mob/living/carbon/human/H) + . = ..() + get_elysium_access(H) + +/datum/outfit/job/elysium/security + name = "Elysium - Mukatell" + job_icon = "securityofficer" + jobtype = /datum/job/officer + + suit = /obj/item/clothing/suit/armor/vest/elysium + gloves = /obj/item/clothing/gloves/fingerless + mask = /obj/item/clothing/mask/bandana/green + backpack = /obj/item/storage/backpack/satchel/sec + uniform = /obj/item/clothing/under/utility + shoes = /obj/item/clothing/shoes/sneakers/black + head = /obj/item/clothing/head/helmet/m10_elysium + backpack_contents = list(/obj/item/kitchen/knife/switchblade) + +/datum/outfit/job/elysium/security/post_equip(mob/living/carbon/human/H) + . = ..() + get_elysium_access(H) + +/datum/outfit/job/elysium/assistant + name = "Elysium - Ahisa`i" + job_icon = "assistant" + jobtype = /datum/job/assistant + + suit = /obj/item/clothing/suit/apparel/black + gloves = /obj/item/clothing/gloves/fingerless + head = /obj/item/clothing/head/shemag/white + backpack = /obj/item/storage/backpack/satchel + uniform = /obj/item/clothing/under/utility + shoes = /obj/item/clothing/shoes/sneakers/black + +/datum/outfit/job/elysium/assistant/post_equip(mob/living/carbon/human/H) + . = ..() + get_elysium_access(H) diff --git a/mod_celadon/stuff_elysium/code/outfits.dm b/mod_celadon/stuff_elysium/code/outfits.dm index 138540cf8b2c..a6c22049c0cf 100644 --- a/mod_celadon/stuff_elysium/code/outfits.dm +++ b/mod_celadon/stuff_elysium/code/outfits.dm @@ -103,7 +103,7 @@ name = "sleeper" icon = 'icons/obj/machines/sleeper.dmi' icon_state = "sleeper" - faction = "elysium" + faction = (FACTION_PLAYER_ELYSIUM) short_desc = "You are a Avanpost Elysium Private Security Officer!" /datum/outfit/avanpost diff --git a/mod_celadon/stuff_elysium/code/shoes.dm b/mod_celadon/stuff_elysium/code/shoes.dm index c5d40c9190f3..c83066109428 100644 --- a/mod_celadon/stuff_elysium/code/shoes.dm +++ b/mod_celadon/stuff_elysium/code/shoes.dm @@ -8,3 +8,8 @@ permeability_coefficient = 0.1 clothing_flags = NOSLIP can_be_tied = FALSE + +/obj/item/clothing/shoes/sneakers/sandals + name = "sandals" + desc = "High speed, no drag combat boots." + icon_state = "cookflops" From f4d301560ac72665d50ab31026f2f5c436ec409a Mon Sep 17 00:00:00 2001 From: Molnia <161384279+molnizz@users.noreply.github.com> Date: Sat, 27 Jul 2024 03:53:41 +0500 Subject: [PATCH 2/2] Finaly --- mod_celadon/_storge_icons/_storge_icons.dme | 9 +++++ .../_storge_icons/icons/obj/elysium_card.dmi | Bin 391 -> 559 bytes mod_celadon/faction/code/faction.dm | 8 +--- .../stuff_elysium/code/outfit_ship/elysium.dm | 38 ++++++++++++++++-- mod_celadon/stuff_inteq/code/outfits.dm | 3 -- 5 files changed, 46 insertions(+), 12 deletions(-) diff --git a/mod_celadon/_storge_icons/_storge_icons.dme b/mod_celadon/_storge_icons/_storge_icons.dme index a979f3b8f234..1ecc01a7d518 100644 --- a/mod_celadon/_storge_icons/_storge_icons.dme +++ b/mod_celadon/_storge_icons/_storge_icons.dme @@ -4,3 +4,12 @@ #include "_storge_icons.dm" #endif +// BEGIN_INTERNALS +// END_INTERNALS +// BEGIN_FILE_DIR +#define FILE_DIR . +// END_FILE_DIR +// BEGIN_PREFERENCES +// END_PREFERENCES +// BEGIN_INCLUDE +// END_INCLUDE diff --git a/mod_celadon/_storge_icons/icons/obj/elysium_card.dmi b/mod_celadon/_storge_icons/icons/obj/elysium_card.dmi index 704ab7b1b125fe4b68dd4188200988fb157543da..94e56b15b53003b6e8805f5f0d62e7d38b4ac99a 100644 GIT binary patch delta 492 zcmVx? z+1c68&(E!`tz~6pYHDg*TU%$^7lr@;00DGTPE!Ct=GbNg0001Tk!4SRSBZ-=C9|j) zC}POPnO2mTn+jp0tBX(0$Ej9X!PU<9poohVl_1lg1T00A0FL_t(YiS1O|a)lra zJj&r97t>g)|Np7Y2E1$A>GY}Nl0YQxCgSMhapQlWs%kT%o-Q=dyfM!w>;#!_t$n!} zuXTVsjB`x`JAugp{uSJRaYXSf5Srvtb9PS_D12XbrJ<;+ccF$raH$P#DjcHXh*h8t zKm-qg^*)vzA1f6IDZvz!odUsBz~oHKv=wBdUh-itfUy=hg*oPliX+Zv@FrkPc7v|7 z7LUO10>acEz>@%funI6+9kPPoO#;-C3NZINWZeh|9}4^W-6SAid?;LYAZ&($@P(6KKT?fk<ERLtq!mDzg&9aThNK?{QtAOdA+84w98k`bolz_7 za>nxiWks_^x(|2B{=cmJ|Nnm%7nk$r&#zs(Haa?b&c&2zKrM_VL4Lsu4$p3+0Xg|q zArU1msl~}fnFS@8`FRWs6?1~a3W`d&k3a!776}Q7-dLYGy@>|| zG!kB=J>#*mop&Jw}EbAV~>T8_pGKuKO! zu7Y(TQCGKSea+Lj!6_6GxH0SNxtp8Q&(Gl%&B%Z66u5EGqQyyH=NVV~F<;DFqjeyS rLG^sY1wWl_24`H@gxRd#JY-