shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensures suit.dm bandits are exempted

Browse Source
This commit is contained in:
Poojawa
2018-10-07 05:36:56 -05:00
parent a05acf5c7e
commit aa8d29fc53
4 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/suits/vg_suits.dm
+14 -14
View File
@@ -9,7 +9,7 @@
siemens_coefficient = 0.5 siemens_coefficient = 0.5
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi' alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
mutantrace_variation == NO_MUTANTRACE_VARIATION mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/suit/armor/xcomsquaddie/dredd /obj/item/clothing/suit/armor/xcomsquaddie/dredd
name = "Judge Armor" name = "Judge Armor"
@@ -18,7 +18,7 @@
item_state = "dredd-suit" item_state = "dredd-suit"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi' alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
mutantrace_variation == NO_MUTANTRACE_VARIATION mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/suit/armor/xcomarmor /obj/item/clothing/suit/armor/xcomarmor
@@ -32,7 +32,7 @@
siemens_coefficient = 0.5 siemens_coefficient = 0.5
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi' alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
mutantrace_variation == NO_MUTANTRACE_VARIATION mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/suit/armor/vest/neorussian /obj/item/clothing/suit/armor/vest/neorussian
name = "neo-Russian vest" name = "neo-Russian vest"
@@ -41,7 +41,7 @@
item_state = "nr_vest" item_state = "nr_vest"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi' alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
mutantrace_variation == NO_MUTANTRACE_VARIATION mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/suit/armor/doomguy /obj/item/clothing/suit/armor/doomguy
name = "Doomguy's armor" name = "Doomguy's armor"
@@ -53,7 +53,7 @@
armor = list(melee = 50, bullet = 30, laser = 20, energy = 20, bomb = 30, bio = 0, rad = 0) armor = list(melee = 50, bullet = 30, laser = 20, energy = 20, bomb = 30, bio = 0, rad = 0)
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi' alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
mutantrace_variation == NO_MUTANTRACE_VARIATION mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/suit/kaminacape /obj/item/clothing/suit/kaminacape
@@ -63,7 +63,7 @@
body_parts_covered = 0 body_parts_covered = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi' alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
mutantrace_variation == NO_MUTANTRACE_VARIATION mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/suit/officercoat /obj/item/clothing/suit/officercoat
name = "Officer's Coat" name = "Officer's Coat"
@@ -71,7 +71,7 @@
icon_state = "officersuit" icon_state = "officersuit"
body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
mutantrace_variation == NO_MUTANTRACE_VARIATION mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/suit/soldiercoat /obj/item/clothing/suit/soldiercoat
name = "Soldier's Coat" name = "Soldier's Coat"
@@ -79,7 +79,7 @@
icon_state = "soldiersuit" icon_state = "soldiersuit"
body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
mutantrace_variation == NO_MUTANTRACE_VARIATION mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/suit/russofurcoat /obj/item/clothing/suit/russofurcoat
name = "russian fur coat" name = "russian fur coat"
@@ -89,7 +89,7 @@
body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi' alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
mutantrace_variation == NO_MUTANTRACE_VARIATION mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/suit/doshjacket /obj/item/clothing/suit/doshjacket
name = "Plasterer's Jacket" name = "Plasterer's Jacket"
@@ -98,7 +98,7 @@
body_parts_covered = CHEST|GROIN|ARMS body_parts_covered = CHEST|GROIN|ARMS
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi' alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
mutantrace_variation == NO_MUTANTRACE_VARIATION mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/suit/maidapron /obj/item/clothing/suit/maidapron
name = "Apron" name = "Apron"
@@ -107,7 +107,7 @@
body_parts_covered = CHEST|GROIN body_parts_covered = CHEST|GROIN
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi' alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
mutantrace_variation == NO_MUTANTRACE_VARIATION mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/suit/clownpiece /obj/item/clothing/suit/clownpiece
name = "small fairy wings" name = "small fairy wings"
@@ -116,7 +116,7 @@
body_parts_covered = 0 body_parts_covered = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi' alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
mutantrace_variation == NO_MUTANTRACE_VARIATION mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/suit/clownpiece/flying /obj/item/clothing/suit/clownpiece/flying
name = "small fairy wings" name = "small fairy wings"
@@ -124,7 +124,7 @@
icon_state = "clownpiece-fly" icon_state = "clownpiece-fly"
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi' alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
mutantrace_variation == NO_MUTANTRACE_VARIATION mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/suit/raincoat /obj/item/clothing/suit/raincoat
name = "Raincoat" name = "Raincoat"
@@ -133,6 +133,6 @@
body_parts_covered =CHEST|GROIN|LEGS|ARMS|HANDS body_parts_covered =CHEST|GROIN|LEGS|ARMS|HANDS
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi' alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
mutantrace_variation == NO_MUTANTRACE_VARIATION mutantrace_variation = NO_MUTANTRACE_VARIATION
modular_citadel/code/modules/clothing/spacesuits/cydonian_armor.dm
+1 -1
View File
@@ -18,7 +18,7 @@
allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator) allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator)
var/energy_color = "#35FFF0" var/energy_color = "#35FFF0"
var/obj/item/clothing/suit/space/hardsuit/lavaknight/linkedsuit = null var/obj/item/clothing/suit/space/hardsuit/lavaknight/linkedsuit = null
mutantrace_variation == NO_MUTANTRACE_VARIATION mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/head/helmet/space/hardsuit/lavaknight/New() /obj/item/clothing/head/helmet/space/hardsuit/lavaknight/New()
..() ..()
modular_citadel/code/modules/clothing/suits/suits.dm
+4 -4
View File
@@ -11,7 +11,7 @@
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi' alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
icon_state = "hostrench" icon_state = "hostrench"
item_state = "hostrench" item_state = "hostrench"
mutantrace_variation == NO_MUTANTRACE_VARIATION mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/suit/hooded/cloak/david /obj/item/clothing/suit/hooded/cloak/david
name = "red cloak" name = "red cloak"
@@ -19,14 +19,14 @@
desc = "Ever wanted to look like a badass without ANY effort? Try this nanotrasen brand red cloak, perfect for kids" desc = "Ever wanted to look like a badass without ANY effort? Try this nanotrasen brand red cloak, perfect for kids"
hoodtype = /obj/item/clothing/head/hooded/cloakhood/david hoodtype = /obj/item/clothing/head/hooded/cloakhood/david
body_parts_covered = CHEST|GROIN|ARMS body_parts_covered = CHEST|GROIN|ARMS
mutantrace_variation == NO_MUTANTRACE_VARIATION mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/head/hooded/cloakhood/david /obj/item/clothing/head/hooded/cloakhood/david
name = "red cloak hood" name = "red cloak hood"
icon_state = "golhood" icon_state = "golhood"
desc = "conceal your face in shame with this nanotrasen brand hood" desc = "conceal your face in shame with this nanotrasen brand hood"
flags_inv = HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR flags_inv = HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR
mutantrace_variation == NO_MUTANTRACE_VARIATION mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/suit/flakjack /obj/item/clothing/suit/flakjack
name = "flak jacket" name = "flak jacket"
@@ -38,5 +38,5 @@
blood_overlay_type = "armor" blood_overlay_type = "armor"
body_parts_covered = CHEST body_parts_covered = CHEST
resistance_flags = NONE resistance_flags = NONE
mutantrace_variation == NO_MUTANTRACE_VARIATION mutantrace_variation = NO_MUTANTRACE_VARIATION
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 5, "bio" = 0, "rad" = 0, "fire" = -5, "acid" = -15) //nylon sucks against acid armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 5, "bio" = 0, "rad" = 0, "fire" = -5, "acid" = -15) //nylon sucks against acid
modular_citadel/code/modules/custom_loadout/custom_items.dm
+6 -6
View File
@@ -78,7 +78,7 @@
icon_state = "labred" icon_state = "labred"
alternate_worn_icon = 'icons/mob/custom_w.dmi' alternate_worn_icon = 'icons/mob/custom_w.dmi'
item_state = "labred" item_state = "labred"
mutantrace_variation == NO_MUTANTRACE_VARIATION mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/suit/toggle/labcoat/labredblack /obj/item/clothing/suit/toggle/labcoat/labredblack
name = "Black and Red Coat" name = "Black and Red Coat"
@@ -87,7 +87,7 @@
icon_state = "labredblack" icon_state = "labredblack"
alternate_worn_icon = 'icons/mob/custom_w.dmi' alternate_worn_icon = 'icons/mob/custom_w.dmi'
item_state = "labredblack" item_state = "labredblack"
mutantrace_variation == NO_MUTANTRACE_VARIATION mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/toy/plush/carrot /obj/item/toy/plush/carrot
name = "carrot plushie" name = "carrot plushie"
@@ -193,7 +193,7 @@
alternate_worn_icon = 'icons/mob/custom_w.dmi' alternate_worn_icon = 'icons/mob/custom_w.dmi'
item_state = "hos-g" item_state = "hos-g"
body_parts_covered = CHEST|GROIN|ARMS|LEGS body_parts_covered = CHEST|GROIN|ARMS|LEGS
mutantrace_variation == NO_MUTANTRACE_VARIATION mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/reagent_containers/food/drinks/flask/russian /obj/item/reagent_containers/food/drinks/flask/russian
name = "russian flask" name = "russian flask"
@@ -275,7 +275,7 @@
/obj/item/clothing/under/bb_sweater/black/naomi /obj/item/clothing/under/bb_sweater/black/naomi
name = "worn black sweater" name = "worn black sweater"
mutantrace_variation == NO_MUTANTRACE_VARIATION mutantrace_variation = NO_MUTANTRACE_VARIATION
desc = "A well-loved sweater, showing signs of several cleanings and re-stitchings. And a few stains. Is that cat fur?" desc = "A well-loved sweater, showing signs of several cleanings and re-stitchings. And a few stains. Is that cat fur?"
/obj/item/clothing/neck/petcollar/naomi /obj/item/clothing/neck/petcollar/naomi
@@ -348,7 +348,7 @@
item_state = "darkcarapace" item_state = "darkcarapace"
blood_overlay_type = "armor" blood_overlay_type = "armor"
dog_fashion = /datum/dog_fashion/back dog_fashion = /datum/dog_fashion/back
mutantrace_variation == NO_MUTANTRACE_VARIATION mutantrace_variation = NO_MUTANTRACE_VARIATION
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
@@ -375,7 +375,7 @@
icon_state = "rdcoat" icon_state = "rdcoat"
alternate_worn_icon = 'icons/mob/custom_w.dmi' alternate_worn_icon = 'icons/mob/custom_w.dmi'
item_state = "rdcoat" item_state = "rdcoat"
mutantrace_variation == NO_MUTANTRACE_VARIATION mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/custom/leechjar /obj/item/custom/leechjar
name = "Jar of Leeches" name = "Jar of Leeches"