merge conflicts

2020-01-30 12:47:48 +08:00
parent beb90d39a6 55a0e4e55d
commit afb4bebf2d
58 changed files with 780 additions and 1266 deletions
@@ -1,138 +0,0 @@
-
-/obj/item/clothing/suit/armor/xcomsquaddie
-	name = "Squaddie Armor"
-	desc = "A suit of armor with heavy padding to protect against projectile and laser attacks. Distributed to shadow organization squaddies."
-	icon_state = "xcomarmor2"
-	item_state = "xcomarmor2"
-	body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
-	armor = list(melee = 50, bullet = 50, laser = 50, energy = 30, bomb = 60, bio = 30, rad = 20)
-	siemens_coefficient = 0.5
-	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
-	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
-	mutantrace_variation = NONE
-
-/obj/item/clothing/suit/armor/xcomsquaddie/dredd
-	name = "Judge Armor"
-	desc = "A large suit of heavy armor, fit for a Judge."
-	icon_state = "dredd-suit"
-	item_state = "dredd-suit"
-	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
-	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
-	mutantrace_variation = NONE
-
-
-/obj/item/clothing/suit/armor/xcomarmor
-	name = "Mysterious Armor"
-	desc = "A suit of armor with heavy plating to protect against melee attacks. Distributed to shadow organization squaddies."
-	icon_state = "xcomarmor1"
-	item_state = "xcomarmor1"
-	body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
-	armor = list(melee = 50, bullet = 50, laser = 50, energy = 30, bomb = 60, bio = 30, rad = 20)
-	slowdown = 1
-	siemens_coefficient = 0.5
-	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
-	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
-	mutantrace_variation = NONE
-
-/obj/item/clothing/suit/armor/vest/neorussian
-	name = "neo-Russian vest"
-	desc = "The narkotiki camo pattern will come useful for botany raids."
-	icon_state = "nr_vest"
-	item_state = "nr_vest"
-	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
-	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
-	mutantrace_variation = NONE
-
-/obj/item/clothing/suit/armor/doomguy
-	name = "Doomguy's armor"
-	desc = ""
-	icon_state = "doom"
-	item_state = "doom"
-	body_parts_covered = CHEST|GROIN
-	slowdown = 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'
-	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
-	mutantrace_variation = NONE
-
-
-/obj/item/clothing/suit/kaminacape
-	name = "Kamina's Cape"
-	desc = "Don't believe in yourself, dumbass. Believe in me. Believe in the Kamina who believes in you."
-	icon_state = "kaminacape"
-	body_parts_covered = 0
-	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
-	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
-	mutantrace_variation = NONE
-
-/obj/item/clothing/suit/officercoat
-	name = "Officer's Coat"
-	desc = "Ein Mantel gemacht, um die Juden zu bestrafen."
-	icon_state = "officersuit"
-	body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS
-	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
-	mutantrace_variation = NONE
-
-/obj/item/clothing/suit/soldiercoat
-	name = "Soldier's Coat"
-	desc = "Und das heißt: Erika."
-	icon_state = "soldiersuit"
-	body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS
-	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
-	mutantrace_variation = NONE
-
-/obj/item/clothing/suit/russofurcoat
-	name = "russian fur coat"
-	desc = "Let the land do the fighting for you."
-	icon_state = "russofurcoat"
-	allowed = list(/obj/item/gun)
-	body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS
-	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
-	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
-	mutantrace_variation = NONE
-
-/obj/item/clothing/suit/doshjacket
-	name = "Plasterer's Jacket"
-	desc = "Perfect for doing up the house."
-	icon_state = "doshjacket"
-	body_parts_covered = CHEST|GROIN|ARMS
-	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
-	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
-	mutantrace_variation = NONE
-
-/obj/item/clothing/suit/maidapron
-	name = "Apron"
-	desc = "Simple white apron."
-	icon_state = "maidapron"
-	body_parts_covered = CHEST|GROIN
-	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
-	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
-	mutantrace_variation = NONE
-
-/obj/item/clothing/suit/clownpiece
-	name = "small fairy wings"
-	desc = "Some small and translucid insect-like wings."
-	icon_state = "clownpiece"
-	body_parts_covered = 0
-	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
-	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
-	mutantrace_variation = NONE
-
-/obj/item/clothing/suit/clownpiece/flying
-	name = "small fairy wings"
-	desc = "Some small and translucid insect-like wings. Looks like these are the real deal!"
-	icon_state = "clownpiece-fly"
-	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
-	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
-	mutantrace_variation = NONE
-
-/obj/item/clothing/suit/raincoat
-	name = "Raincoat"
-	desc = "Do you like Huey Lewis and the News?"
-	icon_state = "raincoat"
-	body_parts_covered =CHEST|GROIN|LEGS|ARMS|HANDS
-	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
-	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
-	mutantrace_variation = NONE
-
-