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

yey, working and in the loadout, though it fucks with the formatting

Browse Source
This commit is contained in:
Poojawa
2018-03-07 02:44:50 -06:00
parent e07efc29fb
commit f3ab2c57d4
4 changed files with 46 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/clothing/under/trek_under.dm
+18 -18
View File
@@ -12,7 +12,7 @@
name = "Section 31 Uniform"
desc = "Oooh... right."
icon = 'modular_citadel/icons/mob/clothing/trek_item_icon.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi'
icon_override = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi'
item_state = ""
can_adjust = FALSE //to prevent you from "wearing it casually"
@@ -93,25 +93,25 @@
name = "Padded Overcoat"
desc = "The overcoat worn by all officers of the 2380s."
icon = 'modular_citadel/icons/mob/clothing/trek_item_icon.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi'
icon_state = "trek_ds9_coat"
item_state = "trek_ds9_coat_mob"
icon_override = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi'
item_state = "trek_ds9_coat"
body_parts_covered = CHEST|GROIN|ARMS
permeability_coefficient = 0.50
allowed = list(
/obj/item/device/flashlight, /obj/item/device/analyzer,
/obj/item/device/radio, /obj/item/weapon/tank/emergency/oxygen,
/obj/item/device/radio, /obj/item/tank/internals/emergency_oxygen,
/obj/item/reagent_containers/hypospray, /obj/item/device/healthanalyzer,/obj/item/reagent_containers/syringe,
/obj/item/reagent_containers/glass/bottle/vial,/obj/item/reagent_containers/glass/beaker,
/obj/item/reagent_containers/pill,/obj/item/storage/pill_bottle
/obj/item/reagent_containers/pill,/obj/item/storage/pill_bottle, /obj/item/restraints/handcuffs
)
armor = list("melee" = 20, "bullet" = 5, "laser" = 5,"energy" = 5, "bomb" = 5, "bio" = 5, "rad" = 10, "fire" = 10, "acid" = 0)
armor = list("melee" = 10, "bullet" = 5, "laser" = 5,"energy" = 5, "bomb" = 5, "bio" = 5, "rad" = 10, "fire" = 10, "acid" = 0)
/obj/item/clothing/suit/storage/trek/ds9/admiral // Only for adminuz
name = "Admiral Overcoat"
desc = "Admirality specialty coat to keep flag officers fashionable and protected."
icon_state = "trek_ds9_coat_adm"
item_state = "trek_ds9_coat_adm_mob"
item_state = "trek_ds9_coat_adm"
permeability_coefficient = 0.01
armor = list("melee" = 50, "bullet" = 50, "laser" = 50,"energy" = 50, "bomb" = 50, "bio" = 50, "rad" = 50, "fire" = 50, "acid" = 50)
@@ -138,28 +138,28 @@
desc = "A uniform jacket from the United Federation. Starfleet still uses this uniform and there are variations of it. Set phasers to awesome."
icon = 'modular_citadel/icons/mob/clothing/trek_item_icon.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi'
icon_override = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi'
icon_state = "fedcoat"
item_state = "fedcoat"
blood_overlay_type = "coat"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
body_parts_covered = CHEST|GROIN|ARMS
allowed = list(
/obj/item/tank/emergency/oxygen,
/obj/item/tank/internals/emergency_oxygen,
/obj/item/device/flashlight,
/obj/item/device/analyzer,
/obj/item/device/radio,
/obj/item/gun,
/obj/item/melee/baton,
/obj/item/handcuffs,
/obj/item/restraints/handcuffs,
/obj/item/reagent_containers/hypospray,
/obj/item/device/healthanalyzer,
/obj/item/reagent_containers/syringe,
/obj/item/reagent_containers/glass/bottle/vial,
/obj/item/reagent_containers/glass/beaker,
/obj/item/storage/pill_bottle
/obj/item/storage/pill_bottle,
/obj/item/device/taperecorder)
armor = list("melee" = 20, "bullet" = 5, "laser" = 5,"energy" = 5, "bomb" = 5, "bio" = 5, "rad" = 10, "fire" = 10, "acid" = 0)
armor = list("melee" = 10, "bullet" = 5, "laser" = 5,"energy" = 5, "bomb" = 5, "bio" = 5, "rad" = 10, "fire" = 10, "acid" = 0)
var/unbuttoned = 0
verb/toggle()
@@ -205,16 +205,16 @@
name = "Modern Federation Uniform Jacket"
desc = "A modern uniform jacket from the United Federation. Their Starfleet had recently started using these uniforms. Wearing this makes you feel like a competant commander."
icon = 'modular_citadel/icons/mob/clothing/trek_item_icon.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi'
icon_override = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi'
icon_state = "fedmodern"
item_state = "fedmodern"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
body_parts_covered = CHEST|GROIN|ARMS
allowed = list(
/obj/item/tank/emergency/oxygen,
/obj/item/tank/internals/emergency_oxygen,
/obj/item/device/flashlight,
/obj/item/gun,
/obj/item/melee/baton,
/obj/item/handcuffs,
/obj/item/restraints/handcuffs,
/obj/item/device/taperecorder)
armor = list("melee" = 45, "bullet" = 25, "laser" = 25,"energy" = 25, "bomb" = 25, "bio" = 25, "rad" = 50, "fire" = 50, "acid" = 50)
@@ -238,8 +238,8 @@
name = "Federation Officer's Cap"
desc = "An officer's cap that demands discipline from the one who wears it."
icon = 'modular_citadel/icons/mob/clothing/trek_item_icon.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi'
icon_state = "fedcapofficer"
icon_override = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi'
item_state = "fedcapofficer_mob"
armor = list("melee" = 10, "bullet" = 10, "laser" = 10,"energy" = 10, "bomb" = 0, "bio" = 10, "rad" = 10, "fire" = 0, "acid" = 0)