From 96912ce8dcb36ffbe1f04c0d9759466d4d0f95ee Mon Sep 17 00:00:00 2001 From: Giacomand Date: Sat, 29 Mar 2014 12:42:23 +0000 Subject: [PATCH] Changed the replica suit/helmet to the black/red version. Changed the description on the uplink datum. Made all the suit/helmet names lowercase for all the different versions. Changed the max_w_class to allow the suit to be inserted, won't allow anything else to be inserted due to the can_hold list not being empty. --- code/datums/uplink_item.dm | 2 +- .../items/weapons/storage/uplink_kits.dm | 1 + code/modules/clothing/head/misc.dm | 6 +-- code/modules/clothing/spacesuits/syndi.dm | 44 +++++++++---------- code/modules/clothing/suits/miscellaneous.dm | 6 +-- 5 files changed, 30 insertions(+), 29 deletions(-) diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 05dde50c127..6712228a671 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -334,7 +334,7 @@ var/list/uplink_items = list() /datum/uplink_item/device_tools/space_suit name = "Syndicate Space Suit" - desc = "The red syndicate space suit is less encumbering than Nanotrasen variants, fits inside bags, and has a weapon slot. Nanotrasen crewmembers are trained to report red space suit sightings." + desc = "The red and black syndicate space suit is less encumbering than Nanotrasen variants, fits inside bags, and has a weapon slot. Nanotrasen crewmembers are trained to report red space suit sightings." item = /obj/item/weapon/storage/box/syndie_kit/space cost = 3 diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index 3a4a88ea13a..46fcaf34cec 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -133,6 +133,7 @@ /obj/item/weapon/storage/box/syndie_kit/space name = "boxed space suit and helmet" can_hold = list(/obj/item/clothing/suit/space/syndicate, /obj/item/clothing/head/helmet/space/syndicate) + max_w_class = 3 /obj/item/weapon/storage/box/syndie_kit/space/New() ..() diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index de1f23b181d..af4e34f1f84 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -46,9 +46,9 @@ icon_state = "nursehat" /obj/item/clothing/head/syndicatefake - name = "red space-helmet replica" - icon_state = "syndicate" - item_state = "syndicate" + name = "black space-helmet replica" + icon_state = "syndicate-helm-black-red" + item_state = "syndicate-helm-black-red" desc = "A plastic replica of a syndicate agent's space helmet, you'll look just like a real murderous syndicate agent in this! This is a toy, it is not made for use in space!" flags = BLOCKHAIR flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE diff --git a/code/modules/clothing/spacesuits/syndi.dm b/code/modules/clothing/spacesuits/syndi.dm index 3873f0d5686..4520c15fc06 100644 --- a/code/modules/clothing/spacesuits/syndi.dm +++ b/code/modules/clothing/spacesuits/syndi.dm @@ -20,131 +20,131 @@ //Green syndicate space suit /obj/item/clothing/head/helmet/space/syndicate/green - name = "Green Space Helmet" + name = "green space helmet" icon_state = "syndicate-helm-green" item_state = "syndicate-helm-green" /obj/item/clothing/suit/space/syndicate/green - name = "Green Space Suit" + name = "green space suit" icon_state = "syndicate-green" item_state = "syndicate-green" //Dark green syndicate space suit /obj/item/clothing/head/helmet/space/syndicate/green/dark - name = "Dark Green Space Helmet" + name = "dark green space helmet" icon_state = "syndicate-helm-green-dark" item_state = "syndicate-helm-green-dark" /obj/item/clothing/suit/space/syndicate/green/dark - name = "Dark Green Space Suit" + name = "dark green space suit" icon_state = "syndicate-green-dark" item_state = "syndicate-green-dark" //Orange syndicate space suit /obj/item/clothing/head/helmet/space/syndicate/orange - name = "Orange Space Helmet" + name = "orange space helmet" icon_state = "syndicate-helm-orange" item_state = "syndicate-helm-orange" /obj/item/clothing/suit/space/syndicate/orange - name = "Orange Space Suit" + name = "orange space suit" icon_state = "syndicate-orange" item_state = "syndicate-orange" //Blue syndicate space suit /obj/item/clothing/head/helmet/space/syndicate/blue - name = "Blue Space Helmet" + name = "blue space helmet" icon_state = "syndicate-helm-blue" item_state = "syndicate-helm-blue" /obj/item/clothing/suit/space/syndicate/blue - name = "Blue Space Suit" + name = "blue space suit" icon_state = "syndicate-blue" item_state = "syndicate-blue" //Black syndicate space suit /obj/item/clothing/head/helmet/space/syndicate/black - name = "Black Space Helmet" + name = "black space helmet" icon_state = "syndicate-helm-black" item_state = "syndicate-helm-black" /obj/item/clothing/suit/space/syndicate/black - name = "Black Space Suit" + name = "black space suit" icon_state = "syndicate-black" item_state = "syndicate-black" //Black-green syndicate space suit /obj/item/clothing/head/helmet/space/syndicate/black/green - name = "Black Space Helmet" + name = "black space helmet" icon_state = "syndicate-helm-black-green" item_state = "syndicate-helm-black-green" /obj/item/clothing/suit/space/syndicate/black/green - name = "Black and Green Space Suit" + name = "black and green space suit" icon_state = "syndicate-black-green" item_state = "syndicate-black-green" //Black-blue syndicate space suit /obj/item/clothing/head/helmet/space/syndicate/black/blue - name = "Black Space Helmet" + name = "black space helmet" icon_state = "syndicate-helm-black-blue" item_state = "syndicate-helm-black-blue" /obj/item/clothing/suit/space/syndicate/black/blue - name = "Black and Blue Space Suit" + name = "black and blue space suit" icon_state = "syndicate-black-blue" item_state = "syndicate-black-blue" //Black medical syndicate space suit /obj/item/clothing/head/helmet/space/syndicate/black/med - name = "Black Space Helmet" + name = "black space helmet" icon_state = "syndicate-helm-black-med" item_state = "syndicate-helm-black" /obj/item/clothing/suit/space/syndicate/black/med - name = "Green Space Suit" + name = "green space suit" icon_state = "syndicate-black-med" item_state = "syndicate-black" //Black-orange syndicate space suit /obj/item/clothing/head/helmet/space/syndicate/black/orange - name = "Black Space Helmet" + name = "black space helmet" icon_state = "syndicate-helm-black-orange" item_state = "syndicate-helm-black" /obj/item/clothing/suit/space/syndicate/black/orange - name = "Black and Orange Space Suit" + name = "black and orange space suit" icon_state = "syndicate-black-orange" item_state = "syndicate-black" //Black-red syndicate space suit /obj/item/clothing/head/helmet/space/syndicate/black/red - name = "Black Space Helmet" + name = "black space helmet" icon_state = "syndicate-helm-black-red" item_state = "syndicate-helm-black-red" /obj/item/clothing/suit/space/syndicate/black/red - name = "Black and Red Space Suit" + name = "black and red space suit" icon_state = "syndicate-black-red" item_state = "syndicate-black-red" //Black with yellow/red engineering syndicate space suit /obj/item/clothing/head/helmet/space/syndicate/black/engie - name = "Black Space Helmet" + name = "black space helmet" icon_state = "syndicate-helm-black-engie" item_state = "syndicate-helm-black" /obj/item/clothing/suit/space/syndicate/black/engie - name = "Black Engineering Space Suit" + name = "black engineering space suit" icon_state = "syndicate-black-engie" item_state = "syndicate-black" \ No newline at end of file diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 780fb24b61d..d8e5aa92500 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -95,9 +95,9 @@ /obj/item/clothing/suit/syndicatefake - name = "red space suit replica" - icon_state = "syndicate" - item_state = "space_suit_syndicate" + name = "black and red space suit replica" + icon_state = "syndicate-black-red" + item_state = "syndicate-black-red" desc = "A plastic replica of the syndicate space suit, you'll look just like a real murderous syndicate agent in this! This is a toy, it is not made for use in space!" w_class = 3 allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/toy)