mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-22 19:47:22 +01:00
cleanup and re-integration of character creation options and client preferences, tiny bit of WIP work on skin_styles, gave soghun access to a couple of new hairstyles, fixed a longstanding bug with supply_packs, update some map paths, some work to integrating mod rank with new tg permissions system (not finished)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
+47
-47
@@ -600,24 +600,24 @@
|
||||
|
||||
/datum/supply_packs/artscrafts
|
||||
name = "Arts and Crafts supplies"
|
||||
contains = list("/obj/item/weapon/storage/crayonbox",
|
||||
"/obj/item/weapon/camera_test",
|
||||
"/obj/item/weapon/camera_film",
|
||||
"/obj/item/weapon/camera_film",
|
||||
"/obj/item/weapon/storage/photo_album",
|
||||
"/obj/item/weapon/packageWrap",
|
||||
"/obj/item/weapon/reagent_containers/glass/paint/red",
|
||||
"/obj/item/weapon/reagent_containers/glass/paint/green",
|
||||
"/obj/item/weapon/reagent_containers/glass/paint/blue",
|
||||
"/obj/item/weapon/reagent_containers/glass/paint/yellow",
|
||||
"/obj/item/weapon/reagent_containers/glass/paint/violet",
|
||||
"/obj/item/weapon/reagent_containers/glass/paint/black",
|
||||
"/obj/item/weapon/reagent_containers/glass/paint/white",
|
||||
"/obj/item/weapon/reagent_containers/glass/paint/remover",
|
||||
"/obj/item/weapon/wrapping_paper",
|
||||
"/obj/item/weapon/wrapping_paper",
|
||||
"/obj/item/weapon/wrapping_paper",
|
||||
"/obj/item/weapon/contraband/poster")
|
||||
contains = list(/obj/item/weapon/storage/crayonbox,
|
||||
/obj/item/device/camera,
|
||||
/obj/item/device/camera_film,
|
||||
/obj/item/device/camera_film,
|
||||
/obj/item/weapon/storage/photo_album,
|
||||
/obj/item/weapon/packageWrap,
|
||||
/obj/item/weapon/reagent_containers/glass/paint/red,
|
||||
/obj/item/weapon/reagent_containers/glass/paint/green,
|
||||
/obj/item/weapon/reagent_containers/glass/paint/blue,
|
||||
/obj/item/weapon/reagent_containers/glass/paint/yellow,
|
||||
/obj/item/weapon/reagent_containers/glass/paint/violet,
|
||||
/obj/item/weapon/reagent_containers/glass/paint/black,
|
||||
/obj/item/weapon/reagent_containers/glass/paint/white,
|
||||
/obj/item/weapon/reagent_containers/glass/paint/remover,
|
||||
/obj/item/weapon/wrapping_paper,
|
||||
/obj/item/weapon/wrapping_paper,
|
||||
/obj/item/weapon/wrapping_paper,
|
||||
/obj/item/weapon/contraband/poster)
|
||||
cost = 5
|
||||
containertype = "/obj/structure/closet/crate"
|
||||
containername = "Arts and Crafts crate"
|
||||
@@ -625,10 +625,10 @@
|
||||
|
||||
/datum/supply_packs/randomised/contraband
|
||||
num_contained = 5
|
||||
contains = list("/obj/item/seeds/bloodtomatoseed",
|
||||
"/obj/item/weapon/storage/pill_bottle/zoom",
|
||||
"/obj/item/weapon/storage/pill_bottle/happy",
|
||||
"/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe")
|
||||
contains = list(/obj/item/seeds/bloodtomatoseed,
|
||||
/obj/item/weapon/storage/pill_bottle/zoom,
|
||||
/obj/item/weapon/storage/pill_bottle/happy,
|
||||
/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe)
|
||||
name = "Contraband crate"
|
||||
cost = 30
|
||||
containertype = /obj/structure/closet/crate
|
||||
@@ -637,33 +637,33 @@
|
||||
|
||||
/datum/supply_packs/boxes
|
||||
name = "Empty Box supplies"
|
||||
contains = list("/obj/item/weapon/storage/box",
|
||||
"/obj/item/weapon/storage/box",
|
||||
"/obj/item/weapon/storage/box",
|
||||
"/obj/item/weapon/storage/box",
|
||||
"/obj/item/weapon/storage/box",
|
||||
"/obj/item/weapon/storage/box",
|
||||
"/obj/item/weapon/storage/box",
|
||||
"/obj/item/weapon/storage/box",
|
||||
"/obj/item/weapon/storage/box",
|
||||
"/obj/item/weapon/storage/box",)
|
||||
contains = list(/obj/item/weapon/storage/box,
|
||||
/obj/item/weapon/storage/box,
|
||||
/obj/item/weapon/storage/box,
|
||||
/obj/item/weapon/storage/box,
|
||||
/obj/item/weapon/storage/box,
|
||||
/obj/item/weapon/storage/box,
|
||||
/obj/item/weapon/storage/box,
|
||||
/obj/item/weapon/storage/box,
|
||||
/obj/item/weapon/storage/box,
|
||||
/obj/item/weapon/storage/box)
|
||||
cost = 5
|
||||
containertype = "/obj/structure/closet/crate"
|
||||
containername = "Empty Box crate"
|
||||
|
||||
/datum/supply_packs/surgery
|
||||
name = "Surgery crate"
|
||||
contains = list("/obj/item/weapon/cautery",
|
||||
"/obj/item/weapon/surgicaldrill",
|
||||
"/obj/item/clothing/mask/breath/medical",
|
||||
"/obj/item/weapon/tank/anesthetic",
|
||||
"/obj/item/weapon/FixOVein",
|
||||
"/obj/item/weapon/hemostat",
|
||||
"/obj/item/weapon/scalpel",
|
||||
"/obj/item/weapon/bonegel",
|
||||
"/obj/item/weapon/retractor",
|
||||
"/obj/item/weapon/bonesetter",
|
||||
"/obj/item/weapon/circular_saw")
|
||||
contains = list(/obj/item/weapon/cautery,
|
||||
/obj/item/weapon/surgicaldrill,
|
||||
/obj/item/clothing/mask/breath/medical,
|
||||
/obj/item/weapon/tank/anesthetic,
|
||||
/obj/item/weapon/FixOVein,
|
||||
/obj/item/weapon/hemostat,
|
||||
/obj/item/weapon/scalpel,
|
||||
/obj/item/weapon/bonegel,
|
||||
/obj/item/weapon/retractor,
|
||||
/obj/item/weapon/bonesetter,
|
||||
/obj/item/weapon/circular_saw)
|
||||
cost = 25
|
||||
containertype = "/obj/structure/closet/crate/secure"
|
||||
containername = "Surgery crate"
|
||||
@@ -672,10 +672,10 @@
|
||||
|
||||
/datum/supply_packs/sterile
|
||||
name = "Sterile equipment crate"
|
||||
contains = list("/obj/item/clothing/under/rank/medical/green",
|
||||
"/obj/item/clothing/under/rank/medical/green",
|
||||
"/obj/item/weapon/storage/stma_kit",
|
||||
"/obj/item/weapon/storage/lglo_kit")
|
||||
contains = list(/obj/item/clothing/under/rank/medical/green,
|
||||
/obj/item/clothing/under/rank/medical/green,
|
||||
/obj/item/weapon/storage/stma_kit,
|
||||
/obj/item/weapon/storage/lglo_kit)
|
||||
cost = 10
|
||||
containertype = "/obj/structure/closet/crate"
|
||||
containername = "Sterile equipment crate"
|
||||
|
||||
Reference in New Issue
Block a user