Merge pull request #136 from Mark9013100/ertedits2

Minor ERT/Central changes
This commit is contained in:
Neerti
2015-08-08 22:11:55 -04:00
4 changed files with 35 additions and 11 deletions
+9 -9
View File
@@ -398,55 +398,55 @@
/var/const/access_cent_general = 101//General facilities.
/datum/access/cent_general
id = access_cent_general
desc = "Code Grey"
desc = "General Facilities"
access_type = ACCESS_TYPE_CENTCOM
/var/const/access_cent_thunder = 102//Thunderdome.
/datum/access/cent_thunder
id = access_cent_thunder
desc = "Code Yellow"
desc = "Entertainment Facilities"
access_type = ACCESS_TYPE_CENTCOM
/var/const/access_cent_specops = 103//Special Ops.
/datum/access/cent_specops
id = access_cent_specops
desc = "Code Black"
desc = "Emergency Response Team Prep"
access_type = ACCESS_TYPE_CENTCOM
/var/const/access_cent_medical = 104//Medical/Research
/datum/access/cent_medical
id = access_cent_medical
desc = "Code White"
desc = "Medical Facilities"
access_type = ACCESS_TYPE_CENTCOM
/var/const/access_cent_living = 105//Living quarters.
/datum/access/cent_living
id = access_cent_living
desc = "Code Green"
desc = "Dormitories"
access_type = ACCESS_TYPE_CENTCOM
/var/const/access_cent_storage = 106//Generic storage areas.
/datum/access/cent_storage
id = access_cent_storage
desc = "Code Orange"
desc = "Storage"
access_type = ACCESS_TYPE_CENTCOM
/var/const/access_cent_teleporter = 107//Teleporter.
/datum/access/cent_teleporter
id = access_cent_teleporter
desc = "Code Blue"
desc = "Central Command Teleporter"
access_type = ACCESS_TYPE_CENTCOM
/var/const/access_cent_creed = 108//Creed's office.
/datum/access/cent_creed
id = access_cent_creed
desc = "Code Silver"
desc = "Emergency Response Team Administration"
access_type = ACCESS_TYPE_CENTCOM
/var/const/access_cent_captain = 109//Captain's office/ID comp/AI.
/datum/access/cent_captain
id = access_cent_captain
desc = "Code Gold"
desc = "Central Command Administration"
access_type = ACCESS_TYPE_CENTCOM
/***************
@@ -405,6 +405,23 @@
new /obj/item/clothing/gloves/black(src)
return
/obj/structure/closet/wardrobe/ert
name = "emergency response team equipment"
icon_state = "syndicate1"
icon_closed = "syndicate1"
icon_opened = "syndicate1open"
/obj/structure/closet/wardrobe/ert/New()
..()
new /obj/item/clothing/under/rank/centcom(src)
new /obj/item/clothing/under/ert(src)
new /obj/item/clothing/under/syndicate/combat(src)
new /obj/item/device/radio/headset/ert(src)
new /obj/item/clothing/glasses/sunglasses(src)
new /obj/item/clothing/shoes/swat(src)
new /obj/item/clothing/gloves/swat(src)
return
/obj/structure/closet/wardrobe/suit
name = "suit locker"
icon_state = "mixed"
+9 -2
View File
@@ -1,4 +1,4 @@
/obj/item/clothing/under/syndicate
/obj/item/clothing/under/syndicate //Merc Tactleneck
name = "tactical turtleneck"
desc = "It's some non-descript, slightly suspicious looking, civilian clothing."
icon_state = "syndicate"
@@ -8,8 +8,15 @@
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.9
/obj/item/clothing/under/syndicate/combat
/obj/item/clothing/under/syndicate/combat //ERT tactleneck
name = "combat turtleneck"
desc = "It's some non-descript, slightly suspicious looking, civilian clothing."
icon_state = "syndicate"
item_state = "bl_suit"
worn_state = "syndicate"
has_sensor = 1
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.9
/obj/item/clothing/under/syndicate/tacticool
name = "\improper Tacticool turtleneck"
Binary file not shown.

Before

Width:  |  Height:  |  Size: 135 KiB

After

Width:  |  Height:  |  Size: 135 KiB