cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-31 01:00:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

Browse Source
This commit is contained in:
izac112
2020-08-22 20:07:45 +02:00
parent 8c55d1cc3f 38f6ff2404
commit 48af4c881c
339 changed files with 12177 additions and 5535 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
+8
View File
@@ -303,6 +303,14 @@
character_name = list("Yikatihaki")
allowed_roles = list("Explorer")
/datum/gear/fluff/suit/storage/flintlock
path = /obj/item/clothing/suit/storage/flintlock
display_name = "Flintlock's jacket"
slot = slot_wear_suit
ckeywhitelist = list("flintlockdafox")
character_name = list("Flintlock Sharpsman")
// G CKEYS
// H CKEYS
code/modules/client/preference_setup/loadout/loadout_xeno.dm
-5
View File
@@ -134,11 +134,6 @@
cloaks[initial(cloak_type.name)] = cloak_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
/datum/gear/mask/ipc_monitor
display_name = "display monitor (Full Body Prosthetic)"
path = /obj/item/clothing/mask/monitor
sort_category = "Xenowear"
/datum/gear/uniform/harness
display_name = "gear harness (Full Body Prosthetic, Diona)"
path = /obj/item/clothing/under/harness