Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ADD: Faction & independent survival boxes #1303

Merged
merged 3 commits into from
Dec 28, 2024
Merged

ADD: Faction & independent survival boxes #1303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ec32fe6
сурвивал бокс апдейт 1
XoMkA-BY Dec 26, 2024
8dd4253
уродский респрайт независимой коробки + чистка мусорных спрайтов
XoMkA-BY Dec 26, 2024
6b63aa6
Merge branch 'beta-dev' into shiptesthampter
XoMkA-BY Dec 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added mod_celadon/_storge_icons/icons/survival_boxes.dmi
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions mod_celadon/items/_items.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,6 @@
#include "code/toggles.dm"
#include "code/under.dm"
#include "code/weapons.dm"
#include "code/boxes.dm"

#endif
116 changes: 110 additions & 6 deletions mod_celadon/items/code/boxes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,110 @@
// NTAS/ERT special survival box
/obj/item/storage/box/survival/ntert
mask_type = /obj/item/clothing/mask/gas/sechailer
internal_type = /obj/item/tank/internals/emergency_oxygen/double
medipen_type = /obj/item/reagent_containers/hypospray/medipen
radio_type = /obj/item/radio

// nanotrasen survival box
/obj/item/storage/box/survival/nanotrasen
name = "nanotrasen survival box"
icon = 'mod_celadon/_storge_icons/icons/survival_boxes.dmi'
icon_state = "box_survival_nt_alt"
mask_type = null
internal_type = null
medipen_type = null
radio_type = null
/obj/item/storage/box/survival/nanotrasen/PopulateContents()
var/static/items_inside = list(
/obj/item/clothing/mask/breath = 1,\
/obj/item/tank/internals/emergency_oxygen/engi = 1,\
/obj/item/reagent_containers/hypospray/medipen = 1,\
/obj/item/reagent_containers/pill/penacid = 1,\
/obj/item/reagent_containers/food/snacks/ration = 1,\
/obj/item/radio = 1,\
/obj/item/crowbar = 1,\
)
generate_items_inside(items_inside,src)


// syndicate survival box
/obj/item/storage/box/survival/syndicate
name = "syndicate survival box"
icon = 'mod_celadon/_storge_icons/icons/survival_boxes.dmi'
icon_state = "box_survival_syn"
mask_type = null
internal_type = null
medipen_type = null
radio_type = null
/obj/item/storage/box/survival/syndicate/PopulateContents()
var/static/items_inside = list(
/obj/item/clothing/mask/gas/syndicate = 1,\
/obj/item/tank/internals/emergency_oxygen/engi = 1,\
/obj/item/reagent_containers/hypospray/medipen/atropine = 1,\
/obj/item/reagent_containers/pill/penacid = 1,\
/obj/item/reagent_containers/food/snacks/donkpocket/warm = 1,\
/obj/item/radio = 1,\
/obj/item/crowbar/syndie = 1,\
)
generate_items_inside(items_inside,src)


// inteq survival box
/obj/item/storage/box/survival/inteq
name = "inteq survival box"
icon = 'mod_celadon/_storge_icons/icons/survival_boxes.dmi'
icon_state = "box_survival_iq"
mask_type = null
internal_type = null
medipen_type = null
radio_type = null
/obj/item/storage/box/survival/inteq/PopulateContents()
var/static/items_inside = list(
/obj/item/clothing/mask/gas/sechailer/balaclava/inteq = 1,\
/obj/item/tank/internals/emergency_oxygen/engi = 1,\
/obj/item/reagent_containers/hypospray/medipen/atropine = 1,\
/obj/item/reagent_containers/pill/penacid = 1,\
/obj/item/reagent_containers/food/snacks/rationpack = 1,\
/obj/item/radio = 1,\
/obj/item/crowbar/red = 1,\
)
generate_items_inside(items_inside,src)


// solfed survival box
/obj/item/storage/box/survival/solfed
name = "solfed survival box"
icon = 'mod_celadon/_storge_icons/icons/survival_boxes.dmi'
icon_state = "box_survival_sol"
mask_type = null
internal_type = null
medipen_type = null
radio_type = null
/obj/item/storage/box/survival/solfed/PopulateContents()
var/static/items_inside = list(
/obj/item/clothing/mask/breath = 1,\
/obj/item/tank/internals/emergency_oxygen/engi = 1,\
/obj/item/reagent_containers/hypospray/medipen = 1,\
/obj/item/reagent_containers/pill/penacid = 1,\
/obj/item/reagent_containers/food/snacks/ration = 1,\
/obj/item/radio = 1,\
/obj/item/crowbar = 1,\
)
generate_items_inside(items_inside,src)


// independent & elisium survival box
/obj/item/storage/box/survival/independent
name = "mass-produced survival box"
icon = 'mod_celadon/_storge_icons/icons/survival_boxes.dmi'
icon_state = "box_survival_ind"
mask_type = null
internal_type = null
medipen_type = null
radio_type = null
/obj/item/storage/box/survival/independent/PopulateContents()
var/static/items_inside = list(
/obj/item/clothing/mask/breath = 1,\
/obj/item/tank/internals/emergency_oxygen = 1,\
/obj/item/reagent_containers/hypospray/medipen = 1,\
/obj/item/reagent_containers/pill/charcoal = 1,\
/obj/item/reagent_containers/food/snacks/ration/bar = 1,\
/obj/item/flashlight/flare = 1,\
/obj/item/radio = 1,\
)
generate_items_inside(items_inside,src)

6 changes: 6 additions & 0 deletions mod_celadon/outfit/code/elysium/outfit_ship/elysium.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
//hopefully дает всему элизиуму коробки для выживания ИСВ(бомжей)

/datum/outfit/job/elysium
box = /obj/item/storage/box/survival/independent


/obj/item/card/id/elysium
desc = "A Elysium ID with no proper access to speak of."
icon = 'mod_celadon/_storge_icons/icons/obj/elysium_card.dmi'
Expand Down
55 changes: 55 additions & 0 deletions mod_celadon/outfit/code/independent/outfit_ship/independent.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,58 @@
//дает всем трупам из легионов(я надеюсь что всем) коробки для выживания исв
/datum/outfit/generic
box = /obj/item/storage/box/survival/independent

/datum/outfit/generic/security
box = /obj/item/storage/box/survival/independent

/datum/outfit/generic/miner
box = /obj/item/storage/box/survival/independent

/datum/outfit/generic/doctor
box = /obj/item/storage/box/survival/independent

/datum/outfit/generic/engineer
box = /obj/item/storage/box/survival/independent



//дает всем нефракционышам коробку для выживания исв
/datum/outfit/job/independent
box = /obj/item/storage/box/survival/independent

/datum/outfit/job/independent/ert/technician
box = /obj/item/storage/box/survival/independent

/datum/outfit/job/independent/chemist
box = /obj/item/storage/box/survival/independent

/datum/outfit/job/independent/ce
box = /obj/item/storage/box/survival/independent

/datum/outfit/job/independent/cmo
box = /obj/item/storage/box/survival/independent

/datum/outfit/job/independent/engineer
box = /obj/item/storage/box/survival/independent

/datum/outfit/job/independent/hos
box = /obj/item/storage/box/survival/independent

/datum/outfit/job/independent/doctor
box = /obj/item/storage/box/survival/independent

/datum/outfit/job/independent/miner
box = /obj/item/storage/box/survival/independent

/datum/outfit/job/independent/paramedic
box = /obj/item/storage/box/survival/independent

/datum/outfit/job/independent/security
box = /obj/item/storage/box/survival/independent

/datum/outfit/job/independent/warden
box = /obj/item/storage/box/survival/independent

/datum/outfit/job/independent/assistant/fancy/lagoon
name = "Independent - Fancy (Formal Uniform)"

Expand Down
4 changes: 4 additions & 0 deletions mod_celadon/outfit/code/inteq/inteq_outfit.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,10 @@
. = ..()
get_inteq_g_acces(H)

// Даёт всем интекашкам брендовый сурвивал бокс
/datum/outfit/job/inteq
box = /obj/item/storage/box/survival/inteq

//Капитан

/datum/outfit/job/inteq/captain/celadon
Expand Down
55 changes: 50 additions & 5 deletions mod_celadon/outfit/code/nanotrasen/nt_outfit.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,45 @@
/datum/outfit/job/nanotrasen/post_equip(mob/living/carbon/human/H)
. = ..()
get_nt_general_access(H)
// Даёт всем НТшкам брендовый сурвивал бокс
/datum/outfit/job/nanotrasen
box = /obj/item/storage/box/survival/nanotrasen

/datum/outfit/job/nanotrasen/hos
box = /obj/item/storage/box/survival/nanotrasen

/datum/outfit/job/nanotrasen/engineer
box = /obj/item/storage/box/survival/nanotrasen

/datum/outfit/job/nanotrasen/security
box = /obj/item/storage/box/survival/nanotrasen

/datum/outfit/job/nanotrasen/paramedic
box = /obj/item/storage/box/survival/nanotrasen

/datum/outfit/job/nanotrasen/doctor
box = /obj/item/storage/box/survival/nanotrasen

/datum/outfit/job/nanotrasen/cmo
box = /obj/item/storage/box/survival/nanotrasen

/datum/outfit/job/nanotrasen/warden
box = /obj/item/storage/box/survival/nanotrasen

/datum/outfit/job/nanotrasen/ce
box = /obj/item/storage/box/survival/nanotrasen

/datum/outfit/job/nanotrasen/atmos
box = /obj/item/storage/box/survival/nanotrasen

/datum/outfit/job/nanotrasen/miner
box = /obj/item/storage/box/survival/nanotrasen

/datum/outfit/job/nanotrasen/doctor/lp
box = /obj/item/storage/box/survival/nanotrasen

/datum/outfit/job/nanotrasen/chemist
box = /obj/item/storage/box/survival/nanotrasen
// Научный директор - РД

/datum/outfit/job/nanotrasen/rd
Expand Down Expand Up @@ -214,7 +252,8 @@
id = /obj/item/card/id/ert
ears = /obj/item/radio/headset/nanotrasen/alt/captain
backpack_contents = list(/obj/item/radio)
box = /obj/item/storage/box/survival/ntert
box = /obj/item/storage/box/survival/nanotrasen


//Nanotrasen Tactical Assault Team сбуха

Expand All @@ -230,7 +269,8 @@
id = /obj/item/card/id/ert/security
ears = /obj/item/radio/headset/nanotrasen/alt
backpack_contents = list(/obj/item/radio)
box = /obj/item/storage/box/survival/ntert

box = /obj/item/storage/box/survival/nanotrasen

//Nanotrasen Tactical Assault Team медик

Expand All @@ -246,7 +286,9 @@
id = /obj/item/card/id/ert/medical
ears = /obj/item/radio/headset/nanotrasen/alt
backpack_contents = list(/obj/item/radio)
box = /obj/item/storage/box/survival/ntert

box = /obj/item/storage/box/survival/nanotrasen


//Nanotrasen Tactical Assault Team инженер

Expand All @@ -262,7 +304,8 @@
id = /obj/item/card/id/ert/engineer
ears = /obj/item/radio/headset/nanotrasen/alt
backpack_contents = list(/obj/item/radio)
box = /obj/item/storage/box/survival/ntert

box = /obj/item/storage/box/survival/nanotrasen

//Nanotrasen Tactical Assault Team уборщичек

Expand All @@ -278,4 +321,6 @@
id = /obj/item/card/id/ert/janitor
ears = /obj/item/radio/headset/nanotrasen/alt
backpack_contents = list(/obj/item/radio)
box = /obj/item/storage/box/survival/ntert

box = /obj/item/storage/box/survival/nanotrasen

19 changes: 19 additions & 0 deletions mod_celadon/outfit/code/solfed/solfed_outfit.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,25 @@
. = ..()
get_solfed_general_access(H)

// Даёт всем СФкам брендовый сурвивал бокс
/datum/outfit/job/solgov
box = /obj/item/storage/box/survival/solfed

/datum/outfit/job/solgov/ert/inspector
box = /obj/item/storage/box/survival/solfed

/datum/outfit/job/solgov/sonnensoldner
box = /obj/item/storage/box/survival/solfed

/datum/outfit/job/solgov/engineer
box = /obj/item/storage/box/survival/solfed

/datum/outfit/job/solgov/doctor
box = /obj/item/storage/box/survival/solfed

/datum/outfit/job/solgov/miner
box = /obj/item/storage/box/survival/solfed

// Ученые
/datum/outfit/job/solgov/scientist
name = "SolGov - Scientific Officer"
Expand Down
43 changes: 43 additions & 0 deletions mod_celadon/outfit/code/syndicate/syndi_outfit.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,49 @@
. = ..()
get_syndi_general_access(H)

// Даёт всем синдешкам брендовый сурвивал бокс
/datum/outfit/job/syndicate
box = /obj/item/storage/box/survival/syndicate

/datum/outfit/job/syndicate/atmos
box = /obj/item/storage/box/survival/syndicate

/datum/outfit/job/syndicate/chemist
box = /obj/item/storage/box/survival/syndicate

/datum/outfit/job/syndicate/ce
box = /obj/item/storage/box/survival/syndicate

/datum/outfit/job/syndicate/engineer
box = /obj/item/storage/box/survival/syndicate

/datum/outfit/job/syndicate/miner
box = /obj/item/storage/box/survival/syndicate

/datum/outfit/job/syndicate/miner/twink
box = /obj/item/storage/box/survival/syndicate

/datum/outfit/job/syndicate/paramedic
box = /obj/item/storage/box/survival/syndicate

/datum/outfit/job/syndicate/doctor
box = /obj/item/storage/box/survival/syndicate

/datum/outfit/job/syndicate/cmo
box = /obj/item/storage/box/survival/syndicate

/datum/outfit/job/syndicate/security
box = /obj/item/storage/box/survival/syndicate

/datum/outfit/job/syndicate/hos
box = /obj/item/storage/box/survival/syndicate

/datum/outfit/job/syndicate/assistant
box = /obj/item/storage/box/survival/syndicate

/datum/outfit/job/syndicate/assistant/suns
box = /obj/item/storage/box/survival/syndicate

/datum/outfit/job/syndicate/science/cybersun
name = "Syndicate - Scientist"
jobtype = /datum/job/scientist
Expand Down
Loading