cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-21 03:56:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into Arokha/matdefs

Browse Source
This commit is contained in:
Aronai Sieyes
2021-07-07 14:29:30 -04:00
committed by GitHub
parent 26beb5d8e7 f3c583b740
commit 8bcd31c91e
283 changed files with 4118 additions and 1405 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/outfits/jobs/civilian.dm
+1
View File
@@ -68,6 +68,7 @@
backpack = /obj/item/weapon/storage/backpack/hydroponics
satchel_one = /obj/item/weapon/storage/backpack/satchel/hyd
messenger_bag = /obj/item/weapon/storage/backpack/messenger/hyd
sports_bag = /obj/item/weapon/storage/backpack/sport/hyd
id_type = /obj/item/weapon/card/id/civilian/service/botanist //VOREStation Edit
pda_type = /obj/item/device/pda/botanist
code/datums/outfits/jobs/medical.dm
+1
View File
@@ -65,6 +65,7 @@
suit = /obj/item/clothing/suit/storage/toggle/labcoat/chemist
backpack = /obj/item/weapon/storage/backpack/chemistry
satchel_one = /obj/item/weapon/storage/backpack/satchel/chem
sports_bag = /obj/item/weapon/storage/backpack/sport/chem
id_type = /obj/item/weapon/card/id/medical/chemist
pda_type = /obj/item/device/pda/chemist
code/datums/outfits/jobs/science.dm
+1
View File
@@ -7,6 +7,7 @@
backpack = /obj/item/weapon/storage/backpack/toxins
satchel_one = /obj/item/weapon/storage/backpack/satchel/tox
messenger_bag = /obj/item/weapon/storage/backpack/messenger/tox
sports_bag = /obj/item/weapon/storage/backpack/sport/tox
/decl/hierarchy/outfit/job/science/rd
name = OUTFIT_JOB_NAME("Research Director")
code/datums/outfits/jobs/security.dm
+1
View File
@@ -8,6 +8,7 @@
satchel_one = /obj/item/weapon/storage/backpack/satchel/sec
backpack_contents = list(/obj/item/weapon/handcuffs = 1)
messenger_bag = /obj/item/weapon/storage/backpack/messenger/sec
sports_bag = /obj/item/weapon/storage/backpack/sport/sec
/decl/hierarchy/outfit/job/security/hos
name = OUTFIT_JOB_NAME("Head of security")
code/datums/outfits/outfit.dm
+2
View File
@@ -56,6 +56,7 @@ var/list/outfits_decls_by_type_
var/satchel_one = /obj/item/weapon/storage/backpack/satchel/norm
var/satchel_two = /obj/item/weapon/storage/backpack/satchel
var/messenger_bag = /obj/item/weapon/storage/backpack/messenger
var/sports_bag = /obj/item/weapon/storage/backpack/sport
var/flags // Specific flags
@@ -76,6 +77,7 @@ var/list/outfits_decls_by_type_
if(3) back = satchel_one
if(4) back = satchel_two
if(5) back = messenger_bag
if(6) back = sports_bag
else back = null
/decl/hierarchy/outfit/proc/post_equip(mob/living/carbon/human/H)
code/datums/supplypacks/hospitality.dm
+17
View File
@@ -79,6 +79,23 @@
containertype = /obj/structure/closet/crate/allico
containername = "crate of gifts"
/datum/supply_pack/hospitality/painting
name = "Painting equipment"
contains = list(
/obj/item/paint_brush = 2,
/obj/item/paint_palette = 2,
/obj/item/weapon/reagent_containers/glass/rag = 2,
/obj/structure/easel = 1, // How does that even fit
/obj/item/canvas = 1,
/obj/item/canvas/nineteen_nineteen = 1,
/obj/item/canvas/twentyfour_twentyfour = 1,
/obj/item/canvas/twentythree_nineteen = 1,
/obj/item/canvas/twentythree_twentythree = 1
)
cost = 20
containertype = /obj/structure/closet/crate/centauri
containername = "Painting equipment"
/datum/supply_pack/randomised/hospitality/
group = "Hospitality"