mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-13 03:33:21 +00:00
Merge pull request #6473 from CHOMPStation2/Rae-freetacticool
add tacticool turt to loadout, give sensors
This commit is contained in:
@@ -97,7 +97,7 @@
|
|||||||
display_name = "vr suit" //The name of the suit as shown in the loadout menu
|
display_name = "vr suit" //The name of the suit as shown in the loadout menu
|
||||||
path = /obj/item/clothing/under/vrsuit //Pathname of the suit which is found in custom_clothes_ch.dm
|
path = /obj/item/clothing/under/vrsuit //Pathname of the suit which is found in custom_clothes_ch.dm
|
||||||
|
|
||||||
// Cargo shorts. The full-of-pockets kind, not the department
|
// Cargo shorts. The full-of-pockets kind, not the department
|
||||||
/datum/gear/uniform/cshorts
|
/datum/gear/uniform/cshorts
|
||||||
display_name = "cargo shorts"
|
display_name = "cargo shorts"
|
||||||
path = /obj/item/clothing/under/shorts/cshorts/khaki
|
path = /obj/item/clothing/under/shorts/cshorts/khaki
|
||||||
@@ -108,4 +108,8 @@
|
|||||||
"Olive cargo shorts" = /obj/item/clothing/under/shorts/cshorts/olive,
|
"Olive cargo shorts" = /obj/item/clothing/under/shorts/cshorts/olive,
|
||||||
"Khaki cargo shorts" = /obj/item/clothing/under/shorts/cshorts/khaki
|
"Khaki cargo shorts" = /obj/item/clothing/under/shorts/cshorts/khaki
|
||||||
)
|
)
|
||||||
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cargo_shorts))
|
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cargo_shorts))
|
||||||
|
|
||||||
|
/datum/gear/uniform/tacticool
|
||||||
|
display_name = "Tacticool turtleneck"
|
||||||
|
path = /obj/item/clothing/under/syndicate/tacticool/loadout
|
||||||
3
code/modules/clothing/under/syndicate_ch.dm
Normal file
3
code/modules/clothing/under/syndicate_ch.dm
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
/obj/item/clothing/under/syndicate/tacticool/loadout //loadout tacticool option. No armor, but has sensors
|
||||||
|
has_sensor = 1
|
||||||
|
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
|
||||||
@@ -2265,6 +2265,7 @@
|
|||||||
#include "code\modules\clothing\under\solgov.dm"
|
#include "code\modules\clothing\under\solgov.dm"
|
||||||
#include "code\modules\clothing\under\solgov_vr.dm"
|
#include "code\modules\clothing\under\solgov_vr.dm"
|
||||||
#include "code\modules\clothing\under\syndicate.dm"
|
#include "code\modules\clothing\under\syndicate.dm"
|
||||||
|
#include "code\modules\clothing\under\syndicate_ch.dm"
|
||||||
#include "code\modules\clothing\under\tribal.dm"
|
#include "code\modules\clothing\under\tribal.dm"
|
||||||
#include "code\modules\clothing\under\accessories\accessory.dm"
|
#include "code\modules\clothing\under\accessories\accessory.dm"
|
||||||
#include "code\modules\clothing\under\accessories\accessory_ch.dm"
|
#include "code\modules\clothing\under\accessories\accessory_ch.dm"
|
||||||
|
|||||||
Reference in New Issue
Block a user