Merge pull request #1 from CHOMPStation2/master

update to master
This commit is contained in:
radiantAurora
2021-06-18 16:09:23 +01:00
committed by GitHub
172 changed files with 85456 additions and 256183 deletions
@@ -371,6 +371,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
//YWadd END
// Destroy/cyborgize organs and limbs.
character.synthetic = null //Clear the existing var.
for(var/name in list(BP_HEAD, BP_L_HAND, BP_R_HAND, BP_L_ARM, BP_R_ARM, BP_L_FOOT, BP_R_FOOT, BP_L_LEG, BP_R_LEG, BP_GROIN, BP_TORSO))
var/status = pref.organ_data[name]
var/obj/item/organ/external/O = character.organs_by_name[name]
@@ -56,6 +56,11 @@
path = /obj/item/weapon/storage/backpack/dufflebag/sci
allowed_roles = list("Research Director","Scientist","Roboticist","Xenobiologist","Xenobotanist")
/datum/gear/utility/dufflebag/explorer
display_name = "explorer dufflebag"
path = /obj/item/weapon/storage/backpack/dufflebag/explorer
allowed_roles = list("Pathfinder","Explorer")
/datum/gear/utility/ID
display_name = "contractor identification card"
path = /obj/item/weapon/card/id/event/polymorphic/altcard