cyberpresidentvanellope/YWPolarisVore
1
0
Fork 0
mirror of https://github.com/Yawn-Wider/YWPolarisVore.git synced 2026-08-26 06:26:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore; branch 'release' of https://github.com/VOREStation/VOREStation into izac

Browse Source
This commit is contained in:
izac112
2022-03-11 15:54:12 +01:00
parent b8b1bdfd5a 5d4a6cf735
commit d9860865fb
39 changed files with 692 additions and 543 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_general.dm
+9
View File
@@ -140,3 +140,12 @@
display_name = "Cards Against The Galaxy (black deck)"
path = /obj/item/weapon/deck/cah/black
description = "The ever-popular Cards Against The Galaxy word game. Warning: may include traces of broken fourth wall. This is the black deck."
/datum/gear/wizoff
display_name = "WizOff"
path = /obj/item/weapon/deck/wizoff
/datum/gear/wizoffguide
display_name = "WizOff Guide"
path = /obj/item/weapon/book/manual/wizzoffguide
description = "The guide to playing the ever popular card game: Wiz-Off!"
code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm
+15 -4
View File
@@ -241,16 +241,27 @@ Talon jumpsuit
// undersuits
/datum/gear/uniform/undersuit
display_name = "undersuit selection"
path = /obj/item/clothing/under/undersuit
path = /obj/item/clothing/under/undersuit/
/datum/gear/uniform/undersuit/New()
..()
var/list/suits = list()
var/list/blacklisted_types = list(/obj/item/clothing/under/undersuit/sec, /obj/item/clothing/under/undersuit/sec/hos, /obj/item/clothing/under/undersuit/hazard, /obj/item/clothing/under/undersuit/command, /obj/item/clothing/under/undersuit/centcom)
for(var/obj/item/clothing/under/undersuit/undersuit_type as anything in typesof(/obj/item/clothing/under/undersuit) - blacklisted_types)
var/list/blacklisted_types = list(/obj/item/clothing/under/undersuit/sec,
/obj/item/clothing/under/undersuit/sec/hos,
/obj/item/clothing/under/undersuit/hazard,
/obj/item/clothing/under/undersuit/command,
/obj/item/clothing/under/undersuit/centcom)
for(var/obj/item/clothing/under/undersuit/undersuit_type as anything in typesof(/obj/item/clothing/under/undersuit))
if(undersuit_type in blacklisted_types)
continue
suits[initial(undersuit_type.name)] = undersuit_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(suits))
/datum/gear/uniform/undersuit_haz
display_name = "undersuit, hazard (Engineering)"
allowed_roles = list("Chief Engineer", "Atmospheric Technician", "Engineer")
path = /obj/item/clothing/under/undersuit/hazard
/datum/gear/uniform/undersuit_sec
display_name = "undersuit, security (Security)"
allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer")
@@ -264,4 +275,4 @@ Talon jumpsuit
/datum/gear/uniform/undersuit_com
display_name = "undersuit, command (SM/HoP)"
allowed_roles = list("Site Manager", "Head of Personnel")
path = /obj/item/clothing/under/undersuit/command
path = /obj/item/clothing/under/undersuit/command