diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index e8454015629..73d54918ff3 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -663,10 +663,11 @@ Pressure: [env.return_pressure()]"} "blue wizard", "red wizard", "marisa wizard", - "emergency rescue team", + "emergency response team", "nanotrasen representative", "nanotrasen officer", "nanotrasen captain", + "nanotrasen supreme commander", "Bomberman", "Bomberman(arena)", ) @@ -939,7 +940,6 @@ Pressure: [env.return_pressure()]"} W.registered_name = M.real_name M.equip_if_possible(W, slot_wear_id) - if("nanotrasen captain") M.equip_if_possible(new /obj/item/clothing/under/rank/centcom/captain(M), slot_w_uniform) M.equip_if_possible(new /obj/item/clothing/shoes/centcom(M), slot_shoes) @@ -964,7 +964,32 @@ Pressure: [env.return_pressure()]"} W.registered_name = M.real_name M.equip_if_possible(W, slot_wear_id) - if("emergency rescue team") + if("nanotrasen supreme commander") + M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom/captain(M), slot_w_uniform) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/centcom(M), slot_shoes) + M.equip_to_slot_or_del(new /obj/item/clothing/gloves/centcom(M), slot_gloves) + M.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/captain(M), slot_ears) + M.equip_to_slot_or_del(new /obj/item/clothing/head/centhat(M), slot_head) + M.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/centcomm(M), slot_wear_suit) + M.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(M), slot_glasses) + M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/laser/captain(M), slot_belt) + + var/obj/item/device/pda/heads/pda = new(M) + pda.owner = M.real_name + pda.ownjob = "Nanotrasen Supreme Commander" + pda.name = "PDA-[M.real_name] ([pda.ownjob])" + + M.equip_to_slot_or_del(pda, slot_r_store) + + var/obj/item/weapon/card/id/admin/W = new(M) + W.name = "[M.real_name]'s ID Card" + W.access = get_all_accesses() + W.access += get_all_centcom_access() + W.assignment = "Nanotrasen Supreme Commander" + W.registered_name = M.real_name + M.equip_to_slot_or_del(W, slot_wear_id) + + if("emergency response team") M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom_officer(M), slot_w_uniform) M.equip_to_slot_or_del(new /obj/item/clothing/shoes/swat(M), slot_shoes) M.equip_to_slot_or_del(new /obj/item/clothing/gloves/swat(M), slot_gloves) diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index 7d0260ec626..cbb6c680a01 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -10,6 +10,17 @@ max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE species_fit = list(VOX_SHAPED) +/obj/item/clothing/gloves/centcom + desc = "Regal green gloves, with a nice gold trim. Lordy." + name = "nanotrasen leader's gloves" + icon_state = "centcom" + item_state = "centcom" + siemens_coefficient = 0 + _color = "centcom" + heat_conductivity = SPACESUIT_HEAT_CONDUCTIVITY + pressure_resistance = 200 * ONE_ATMOSPHERE + max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE + /obj/item/clothing/gloves/cyborg desc = "beep boop borp" name = "cyborg gloves" diff --git a/code/modules/clothing/spacesuits/captain.dm b/code/modules/clothing/spacesuits/captain.dm index 776c0280afb..41b2ba82f28 100644 --- a/code/modules/clothing/spacesuits/captain.dm +++ b/code/modules/clothing/spacesuits/captain.dm @@ -20,11 +20,33 @@ w_class = W_CLASS_LARGE gas_transfer_coefficient = 0.01 permeability_coefficient = 0.02 - flags = FPRINT + flags = FPRINT | ONESIZEFITSALL pressure_resistance = 200 * ONE_ATMOSPHERE body_parts_covered = ARMS|LEGS|FULL_TORSO|FEET allowed = list(/obj/item/weapon/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy, /obj/item/weapon/gun/projectile, /obj/item/ammo_storage, /obj/item/ammo_casing, /obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_nitrogen) slowdown = 1.5 armor = list(melee = 65, bullet = 50, laser = 50, energy = 25, bomb = 50, bio = 100, rad = 50) siemens_coefficient = 0.7 - heat_conductivity = SPACESUIT_HEAT_CONDUCTIVITY \ No newline at end of file + heat_conductivity = SPACESUIT_HEAT_CONDUCTIVITY + +/obj/item/clothing/suit/armor/captain/old + icon_state = "oldcaparmor" + +/obj/item/clothing/suit/armor/centcomm + name = "Cent. Com. armor" + desc = "This bulky armor is the property of Nanotrasen's supreme leader. Witness and behold!" + icon_state = "centcom" + item_state = "centcom" + w_class = W_CLASS_LARGE + gas_transfer_coefficient = 0.01 + permeability_coefficient = 0.02 + flags = FPRINT | ONESIZEFITSALL | PLASMAGUARD + body_parts_covered = ARMS|LEGS|FULL_TORSO|FEET + allowed = list(/obj/item/weapon/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy, /obj/item/weapon/gun/projectile, /obj/item/ammo_storage, /obj/item/ammo_casing, /obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_nitrogen) + armor = list(melee = 65, bullet = 55, laser = 50, energy = 25, bomb = 50, bio = 100, rad = 60) + max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE + heat_conductivity = SPACESUIT_HEAT_CONDUCTIVITY + siemens_coefficient = 0 + +/obj/item/clothing/suit/armor/centcomm/old + icon_state = "oldcentcom" diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 62ea19e133d..9447af959ca 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -213,18 +213,6 @@ //All of the armor below is mostly unused - -/obj/item/clothing/suit/armor/centcomm - name = "Cent. Com. armor" - desc = "A suit that protects against some damage." - icon_state = "centcom" - item_state = "centcom" - w_class = W_CLASS_LARGE//bulky item - body_parts_covered = ARMS|LEGS|FULL_TORSO|FEET|HANDS - allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/tank/emergency_nitrogen) - heat_conductivity = SPACESUIT_HEAT_CONDUCTIVITY - siemens_coefficient = 0 - /obj/item/clothing/suit/armor/heavy name = "heavy armor" desc = "A heavily armored suit that protects against moderate damage." diff --git a/icons/mob/hands.dmi b/icons/mob/hands.dmi index b02b521eb9e..f0efe5b9e69 100644 Binary files a/icons/mob/hands.dmi and b/icons/mob/hands.dmi differ diff --git a/icons/mob/in-hand/left/gloves.dmi b/icons/mob/in-hand/left/gloves.dmi index 7e98888c58d..8900e82378f 100644 Binary files a/icons/mob/in-hand/left/gloves.dmi and b/icons/mob/in-hand/left/gloves.dmi differ diff --git a/icons/mob/in-hand/right/gloves.dmi b/icons/mob/in-hand/right/gloves.dmi index 0b8c601af41..0ecfd7f986c 100644 Binary files a/icons/mob/in-hand/right/gloves.dmi and b/icons/mob/in-hand/right/gloves.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 9501ef8a85e..8b3de203e97 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/mob/suit_fat.dmi b/icons/mob/suit_fat.dmi index e1afc8ff4e8..e5fa1f5758f 100644 Binary files a/icons/mob/suit_fat.dmi and b/icons/mob/suit_fat.dmi differ diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi index bc0896099b6..a93688702e7 100644 Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index d27f74d8758..9434919a3f5 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ