diff --git a/_maps/map_files/RandomRuins/SpaceRuins/old_station_ss1984.dmm b/_maps/map_files/RandomRuins/SpaceRuins/old_station_ss1984.dmm
index 5c8112341b2..1245de5fdb0 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/old_station_ss1984.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/old_station_ss1984.dmm
@@ -4697,15 +4697,11 @@
color = "red";
dir = 4
},
-/obj/item/gun/projectile/shotgun{
- name = "Remington 871M"
- },
/obj/structure/closet/secure_closet/guncabinet{
req_access = list(271)
},
-/obj/item/gun/projectile/shotgun{
- name = "Remington 871M"
- },
+/obj/item/gun/projectile/shotgun/old,
+/obj/item/gun/projectile/shotgun/old,
/turf/simulated/floor/plasteel,
/area/ruin/space/ancientstation/charlie_armory)
"qo" = (
@@ -6864,13 +6860,10 @@
/obj/item/ammo_box/magazine/enforcer,
/obj/item/ammo_box/magazine/enforcer,
/obj/item/circuitboard/holopad,
-/obj/item/gun/projectile/automatic/pistol/enforcer{
- name = "Glock 25";
- desc = "Rare weapon, engraving reads: Command with style! To the best captain of NRS ABOTC."
- },
/obj/structure/window/reinforced,
/obj/item/clothing/suit/space/nasavoid/captain,
/obj/item/clothing/head/helmet/space/nasavoid/captain,
+/obj/item/gun/projectile/automatic/pistol/enforcer/old,
/turf/simulated/floor/plasteel,
/area/ruin/space/ancientstation/charlie_comm)
"xJ" = (
diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm
index 88bba73de4b..20d4c69d924 100644
--- a/code/game/objects/items/weapons/tanks/jetpack.dm
+++ b/code/game/objects/items/weapons/tanks/jetpack.dm
@@ -182,13 +182,6 @@
icon_state = "jetpack-void"
item_state = "jetpack-void"
-/obj/item/tank/jetpack/void/grey
- name = "Void Jetpack (Oxygen)"
- icon_state = "jetpack-void-grey"
-
-/obj/item/tank/jetpack/void/gold
- name = "Retro Jetpack (Oxygen)"
- icon_state = "jetpack-void-gold"
/obj/item/tank/jetpack/oxygen
name = "Jetpack (Oxygen)"
@@ -328,5 +321,3 @@
configure_jetpack(skip_trails = FALSE)
return ..()
-
-
diff --git a/code/modules/awaymissions/mission_code/ruins/oldstation.dm b/code/modules/awaymissions/mission_code/ruins/oldstation.dm
index cc6d3f1ab72..9dc10e915d5 100644
--- a/code/modules/awaymissions/mission_code/ruins/oldstation.dm
+++ b/code/modules/awaymissions/mission_code/ruins/oldstation.dm
@@ -50,35 +50,61 @@
access = list(ACCESS_ROBOTICS)
/obj/item/storage/backpack/old
- max_combined_w_class = 12
+ name = "Belt and shoulder system"
+ desc = "The belt-and-shoulder system developed for astronauts originally served as a safety harness to be worn on top of the spacesuit."
+ icon_state = "oldnasa"
+ item_state = "oldnasa"
+ icon = 'icons/mob/clothing/back.dmi'
+ lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/clothing_righthand.dmi'
+ storage_slots = 25
+ slot_flags = list(ITEM_SLOT_BELT, ITEM_SLOT_BACK)
+ max_combined_w_class = 25
+ display_contents_with_number = TRUE
+ max_w_class = WEIGHT_CLASS_SMALL
// Equipment
-/obj/item/clothing/head/helmet/space/nasavoid/old
- name = "Engineering Void Helmet"
- desc = "A CentCom engineering dark red space suit helmet. While old and dusty, it still gets the job done."
- icon_state = "void-red"
- item_state = "void"
-
-/obj/item/clothing/suit/space/nasavoid/old
- name = "Engineering Voidsuit"
- icon_state = "void-red"
- item_state = "void"
- desc = "A CentCom engineering dark red space suit. Age has degraded the suit making is difficult to move around in."
- slowdown = 4
- allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/multitool)
/obj/item/clothing/head/helmet/old
- name = "degrading helmet"
- desc = "Standard issue security helmet. Due to degradation the helmet's visor obstructs the users ability to see long distances."
+ name = "BM1 helmet"
+ desc = "Steel helmet, the cheap plastic visor is clouded and yellowed, unfortunately it's welded on."
tint = 2
/obj/item/clothing/suit/armor/vest/old
- name = "degrading armor vest"
- desc = "Older generation Type 1 armored vest. Due to degradation over time the vest is far less maneuverable to move in."
+ name = "BM1 armor vest"
+ desc = "It's body armor, its straps have worn out and now it keeps sliding off. You can't feel the shock absorber behind the plate, what is it? A book?"
icon_state = "armor"
item_state = "armor"
slowdown = 1
+/obj/item/gun/projectile/automatic/pistol/enforcer/old
+ name = "Glock 25"
+ desc = "A rare example of a 21st century pistol, a luxury item. The pistol is designed for 9 mm cartridge and is stamped ABOTCH CR 412."
+ icon_state = "enforcer_grey"
+ force = 10
+ mag_type = /obj/item/ammo_box/magazine/enforcer
+ fire_sound = 'sound/weapons/gunshots/1colt.ogg'
+ can_suppress = TRUE
+ unique_reskin = TRUE
+ can_flashlight = TRUE
+ gun_light_overlay = "enforcer-light"
+
+/obj/item/gun/projectile/shotgun/old
+ name = "Remington 871M"
+ desc = "Traditional shotgun with wooden hardware and a four-round magazine at the bottom. It is stamped ABOTCH-2231"
+ icon_state = "shotgun"
+ item_state = "shotgun"
+ w_class = WEIGHT_CLASS_BULKY
+ force = 10
+ flags = CONDUCT
+ can_holster = FALSE
+ slot_flags = ITEM_SLOT_BACK
+ origin_tech = "combat=4;materials=2"
+ mag_type = /obj/item/ammo_box/magazine/internal/shot
+ fire_sound = 'sound/weapons/gunshots/1shotgun_old.ogg'
+ weapon_weight = WEAPON_HEAVY
+ pb_knockback = 2
+
/obj/item/gun/energy/laser/retro/old
name ="laser gun"
icon_state = "retro"
@@ -102,10 +128,11 @@
e_cost = 1000
// Papers
+
/obj/item/paper/fluff/ruins/oldstation
name = "Cryo Awakening Alert"
language = LANGUAGE_SOL_COMMON
- info = "**WARNING**
Catastrophic damage sustained to station. Powernet exhausted to reawaken crew.
Immediate Objectives
1: Activate emergency power generator
2: Lift station lockdown on the bridge
Please locate the 'Damage Report' on the bridge for a detailed situation report."
+ info = "**WARNING**
Catastrophic damage sustained to station. Powernet exhausted to reawaken crew.
Immediate Objectives
1: Activate emergency power generator
2: Lift station lockdown on the bridge
Please locate the 'Damage Report' on the bridge for a detailed situation report."
/obj/item/paper/fluff/ruins/oldstation/damagereport
name = "Damage Report"
diff --git a/code/modules/clothing/spacesuits/void.dm b/code/modules/clothing/spacesuits/void.dm
index 94b54fa52f1..d81d550caae 100644
--- a/code/modules/clothing/spacesuits/void.dm
+++ b/code/modules/clothing/spacesuits/void.dm
@@ -1,11 +1,14 @@
-
//Voidsuits
+
/obj/item/clothing/head/helmet/space/nasavoid
- name = "NASA Void Helmet"
- desc = "A high tech, NASA Centcom branch designed space suit helmet. Used for AI satellite maintenance."
+ name = "SC TsAGI 10 helmet"
+ desc = "The spacesuit helmet is of semi-rigid type, based on the design of SC TsAGI 5. It is a hood with reinforcing inserts."
icon_state = "void-red"
- item_state = "void"
- flags_inv = HIDEMASK|HIDEHEADSETS
+ item_state = "void-red-helmet"
+ lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/clothing_righthand.dmi'
+ flags_inv = HIDEMASK|HIDEHEADSETS|HIDEGLASSES|HIDENAME
+ armor = list(MELEE = 40, BULLET = 30, LASER = 30, ENERGY = 25, BOMB = 40, BIO = 100, RAD = 75, FIRE = 75, ACID = 75)
sprite_sheets = list(
SPECIES_GREY = 'icons/mob/clothing/species/grey/helmet.dmi',
SPECIES_TAJARAN = 'icons/mob/clothing/species/tajaran/helmet.dmi',
@@ -14,82 +17,215 @@
SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/helmet.dmi',
SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/helmet.dmi',
SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/helmet.dmi',
- SPECIES_VOX = 'icons/mob/clothing/species/vox/helmet.dmi')
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/helmet.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/vox/helmet.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi')
/obj/item/clothing/suit/space/nasavoid
- name = "NASA Void Suit"
+ name = "SC TsAGI 10 spacesuit"
+ desc = "Semi-rigid spacesuit, based on the design of SC TsAGI 5. It is a jumpsuit with reinforcing inserts."
icon_state = "void-red"
- item_state = "void"
- desc = "A high tech, NASA Centcom branch designed space suit. Used for AI satellite maintenance."
+ item_state = "void-red"
+ lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/clothing_righthand.dmi'
+ armor = list(MELEE = 40, BULLET = 30, LASER = 30, ENERGY = 25, BOMB = 40, BIO = 100, RAD = 75, FIRE = 75, ACID = 75)
allowed = list(/obj/item/flashlight,/obj/item/tank/internals,/obj/item/multitool)
sprite_sheets = list(
- SPECIES_TAJARAN = 'icons/mob/clothing/species/tajaran/suit.dmi',
- SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/suit.dmi',
- SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/suit.dmi',
- SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/suit.dmi',
- SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/suit.dmi',
- SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
- SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi')
-
-//Colors!!!
+ SPECIES_GREY = 'icons/mob/clothing/species/grey/helmet.dmi',
+ SPECIES_TAJARAN = 'icons/mob/clothing/species/tajaran/helmet.dmi',
+ SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/helmet.dmi',
+ SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/helmet.dmi',
+ SPECIES_VOX = 'icons/mob/clothing/species/vox/helmet.dmi',
+ SPECIES_DRASK = 'icons/mob/clothing/species/vox/helmet.dmi',
+ SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
+ SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi')
+
+/obj/item/clothing/head/helmet/space/nasavoid/old
+ name = "NASA engineering helmet"
+ desc = "Heavy duty industrial helmet for engineering work."
+ icon_state = "void-red"
+ item_state = "void-red-helmet"
+
+ flash_protect = FLASH_PROTECTION_FLASH
+ flash_protect = FLASH_PROTECTION_WELDER
+ armor = list(MELEE = 30, BULLET = 30, LASER = 20, ENERGY = 25, BOMB = 75, BIO = 100, RAD = 90, FIRE = 100, ACID = 75)
+ item_state = "void-red-helmet"
+ lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/clothing_righthand.dmi'
+
+/obj/item/clothing/suit/space/nasavoid/old
+ name = "NASA engineering spacesuit"
+ desc = "Tough engineering spacesuit. SC TsAGI 5 style, mechanical exoskeleton with steel inserts, equipped with welding protection for engineering work. Designed by NASA Division."
+ icon_state = "void-red"
+ item_state = "void-red"
+ slowdown = 4
+ allowed = list(/obj/item/flashlight,/obj/item/storage/toolbox, /obj/item/tank/internals, /obj/item/t_scanner, /obj/item/rcd, /obj/item/crowbar, /obj/item/screwdriver, /obj/item/weldingtool, /obj/item/wirecutters, /obj/item/wrench, /obj/item/multitool, /obj/item/radio, /obj/item/analyzer)
+ armor = list(MELEE = 30, BULLET = 30, LASER = 20, ENERGY = 25, BOMB = 75, BIO = 100, RAD = 90, "fire" = 100, ACID = 75)
+ item_state = "void-red"
+ lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/clothing_righthand.dmi'
+
/obj/item/clothing/head/helmet/space/nasavoid/green
+ name = "SC TsAGI 9 Helmet"
+ desc = "Rigid combat spacesuit shem based on the design of SC TsAGI 5. It is an armored hood with shrapnel protection, inserted ballistic plates. Made in TSF."
icon_state = "void-green"
+ armor = list(MELEE = 30, BULLET = 60, LASER = 40, ENERGY = 30, BOMB = 50, BIO = 100, RAD = 50, FIRE = 75, ACID = 75)
+ item_state = "void-green-helmet"
+ lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/clothing_righthand.dmi'
/obj/item/clothing/suit/space/nasavoid/green
+ name = "SC TsAGI 9 spacesuit"
+ desc = "Rigid combat spacesuit, based on the design of SC TsAGI 5. It is an armored suit with shrapnel protection, inserted ballistic plates. Made in TSF."
icon_state = "void-green"
+ allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals)
+ armor = list(MELEE = 30, BULLET = 60, LASER = 40, ENERGY = 30, BOMB = 50, BIO = 100, RAD = 50, FIRE = 75, ACID = 75)
+ slowdown = 4
+ item_state = "void-green"
+ lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/clothing_righthand.dmi'
+
+//Nasa vip
/obj/item/clothing/head/helmet/space/nasavoid/ntblue
+ name = "NASA helmet for VIPs"
+ desc = "Semi-rigid spacesuit helmet for VIPs, based on the design of the SC TsAGI 5. It is a hood with steel inserts. Developed by a division of NASA."
icon_state = "void-ntblue"
+ armor = list(MELEE = 40, BULLET = 30, LASER = 30, ENERGY = 25, BOMB = 40, BIO = 100, RAD = 75, FIRE = 75, ACID = 75)
+ item_state = "void-ntblue-helmet"
+ lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/clothing_righthand.dmi'
/obj/item/clothing/suit/space/nasavoid/ntblue
+ name = "NASA spacesuit for VIPs"
+ desc = "Semi-rigid spacesuit for VIPs, based on the design of SC TsAGI 5. It is a jumpsuit with steel inserts. Developed by a division of NASA."
icon_state = "void-ntblue"
+ w_class = WEIGHT_CLASS_NORMAL
+ allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals)
+ armor = list(MELEE = 40, BULLET = 30, LASER = 30, ENERGY = 25, BOMB = 40, BIO = 100, RAD = 75, FIRE = 75, ACID = 75)
+ item_state = "void-ntblue"
+ lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/clothing_righthand.dmi'
+
+//Nasa RnD
/obj/item/clothing/head/helmet/space/nasavoid/purple
+ name = "NASA RnD helmet"
+ desc = "A rigid spacesuit helmet for research work, based on the SC TsAGI 5 design. It is a sapper hood with modification for the space environment. Developed by a division of NASA."
icon_state = "void-purple"
+ flash_protect = FLASH_PROTECTION_WELDER
+ armor = list(MELEE = 50, BULLET = 20, LASER = 10, ENERGY = 25, BOMB = 95, BIO = 100, RAD = 75, FIRE = 75, ACID = 75)
+ item_state = "void-purple-helmet"
+ lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/clothing_righthand.dmi'
/obj/item/clothing/suit/space/nasavoid/purple
+ name = "NASA RnD spacesuit"
+ desc = "A rigid spacesuit for research work, based on the SC TsAGI 5 design. It is a bomb suit with modification for space environment. Developed by a division of NASA."
icon_state = "void-purple"
+ allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/t_scanner, /obj/item/rcd, /obj/item/crowbar, /obj/item/screwdriver, /obj/item/weldingtool, /obj/item/wirecutters, /obj/item/wrench, /obj/item/multitool, /obj/item/radio, /obj/item/analyzer)
+ armor = list(MELEE = 50, BULLET = 20, LASER = 10, ENERGY = 25, BOMB = 95, BIO = 100, RAD = 75, FIRE = 75, ACID = 75)
+ slowdown = 4
+ item_state = "void-purple"
+ lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/clothing_righthand.dmi'
+
+//Nasa Miner
/obj/item/clothing/head/helmet/space/nasavoid/yellow
+ name = "NASA mining helmet"
+ desc = "A rigid spacesuit helmet for mining work, based on the SC TsAGI 5 design. Is a reinforced helmet for working in the depths of rocky guts. Developed by a division of NASA."
icon_state = "void-yellow"
+ armor = list(MELEE = 65, BULLET = 10, LASER = 10, ENERGY = 10, BOMB = 30, BIO = 100, RAD = 50, FIRE = 50, ACID = 75)
+ item_state = "void-yellow-helmet"
+ lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/clothing_righthand.dmi'
/obj/item/clothing/suit/space/nasavoid/yellow
+ name = "NASA mining spacesuit."
+ desc = "Rigid spacesuit for mining operations, based on the SC TsAGI 5 design. Is a mechanical exoskeleton for working in the depths of rocky guts. Developed by a division of NASA."
icon_state = "void-yellow"
+ allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/storage/bag/ore, /obj/item/pickaxe, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/twohanded/kinetic_crusher, /obj/item/hierophant_club, /obj/item/twohanded/fireaxe/boneaxe)
+ armor = list(MELEE = 65, BULLET = 10, LASER = 10, ENERGY = 10, BOMB = 30, BIO = 100, RAD = 50, FIRE = 50, ACID = 75)
+ item_state = "void-yellow"
+ lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/clothing_righthand.dmi'
+
+//Nasa Med
/obj/item/clothing/head/helmet/space/nasavoid/ltblue
+ name = "NASA medical helmet"
+ desc = "Semi-rigid helmet of the paramedic spacesuit, based on the SC TsAGI 5 design. Combination of an emergency spacesuit and a chemical defense suit, with some inserts against mechanical damage. Developed by a division of NASA."
icon_state = "void-light_blue"
+ armor = list(MELEE = 20, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 30, BIO = 100, RAD = 75, FIRE = 90, ACID = 100)
+ item_state = "void-light_blue-helmet"
+ lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/clothing_righthand.dmi'
/obj/item/clothing/suit/space/nasavoid/ltblue
+ name = "NASA medical spacesuit"
+ desc = "Semi-rigid paramedic spacesuit based on the SC TsAGI 5 design. Combination of an emergency spacesuit and a chemical defense suit, with some inserts against mechanical damage. Developed by a division of NASA."
icon_state = "void-light_blue"
-
+ allowed = list(/obj/item/flashlight,/obj/item/tank/internals,/obj/item/storage/firstaid,/obj/item/healthanalyzer,/obj/item/stack/medical,/obj/item/rad_laser)
+ w_class = WEIGHT_CLASS_NORMAL
+ armor = list(MELEE = 20, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 30, BIO = 100, RAD = 75, FIRE = 90, ACID = 100)
+ item_state = "void-light_blue"
+ lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/clothing_righthand.dmi'
//Captian's Suit, like the other captian's suit, but looks better, at the cost of armor
+
/obj/item/clothing/head/helmet/space/nasavoid/captain
- name = "Fancy Retro Void Helmet"
+ name = "NASA captain helmet"
icon_state = "void-captian"
- desc = "A high tech, NASA Centcom branch designed space suit helmet. Used for AI satellite maintenance. This one is fit for a captain."
+ desc = "Repainted semi-hard helmet from the VIP suit, same SC TsAGI 5 style. It is a hood with steel inserts."
+ armor = list(MELEE = 40, BULLET = 30, LASER = 30, ENERGY = 25, BOMB = 40, BIO = 100, RAD = 75, FIRE = 75, ACID = 75)
+ item_state = "void-captian-helmet"
+ lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/clothing_righthand.dmi'
/obj/item/clothing/suit/space/nasavoid/captain
- name = "Fancy NASA Void Suit"
+ name = "NASA captain spacesuit"
icon_state = "void-captian"
- desc = "A high tech, NASA Centcom branch designed space suit. Used for AI satellite maintenance. This one is fit for a captain."
+ allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals)
+ desc = "A repainted semi-hard suit for the VIPs, still the same SC TsAGI 5 style. It is a jumpsuit with steel inserts."
+ armor = list(MELEE = 40, BULLET = 30, LASER = 30, ENERGY = 25, BOMB = 40, BIO = 100, RAD = 75, FIRE = 75, ACID = 75)
+ item_state = "void-captian"
+ lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/clothing_righthand.dmi'
//Syndi's suit, on par with a blood red softsuit
/obj/item/clothing/head/helmet/space/nasavoid/syndi
- name = "Blood Red Retro Void Helmet"
+ name = "Blood red infantry helmet"
icon_state = "void-syndi"
- desc = "A high tech, NASA Centcom branch designed space suit helmet. This one looks rather suspicious."
- flags_inv = HIDEMASK|HIDEHEADSETS|HIDEGLASSES|HIDENAME
- armor = list("melee" = 40, "bullet" = 50, "laser" = 30,"energy" = 15, "bomb" = 30, "bio" = 30, "rad" = 30, "fire" = 80, "acid" = 85)
+ desc = "A semi-rigid infantry helmet. SC TsAGI 5 style, plate ballistic armor, and Kevlar fabric, the design allows it to be folded into a backpack. Developer not listed."
+ armor = list(MELEE = 40, BULLET = 50, LASER = 30, ENERGY = 25, BOMB = 30, BIO = 100, RAD = 30, FIRE = 80, ACID = 85)
+ flash_protect = FLASH_PROTECTION_FLASH
+ item_state = "void-syndi-helmet"
+ lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/clothing_righthand.dmi'
/obj/item/clothing/suit/space/nasavoid/syndi
- name = "Blood Red NASA Void Suit"
+ name = "Blood red infantry suit."
icon_state = "void-syndi"
- desc = "A high tech, NASA Centcom branch designed space suit. This one looks rather suspicious."
+ desc = "A semi-rigid infantry suit. SC TsAGI 5 style, plate ballistic armor, and Kevlar fabric, the design allows it to be folded into a backpack. Developer not listed."
w_class = WEIGHT_CLASS_NORMAL
allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals)
- armor = list("melee" = 40, "bullet" = 50, "laser" = 30,"energy" = 15, "bomb" = 30, "bio" = 30, "rad" = 30, "fire" = 80, "acid" = 85)
+ armor = list(MELEE = 40, BULLET = 50, LASER = 30, ENERGY = 25, BOMB = 30, BIO = 100, RAD = 30, FIRE = 80, ACID = 85)
+ item_state = "void-syndi"
+ lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/clothing_righthand.dmi'
//random spawner
diff --git a/code/modules/mob/living/simple_animal/hostile/hivebot.dm b/code/modules/mob/living/simple_animal/hostile/hivebot.dm
index 56754f15791..60ae039c4ae 100644
--- a/code/modules/mob/living/simple_animal/hostile/hivebot.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hivebot.dm
@@ -3,29 +3,28 @@
damage_type = BRUTE
/mob/living/simple_animal/hostile/hivebot
- name = "Hivebot"
- desc = "A small robot."
+ name = "Basic Hivebot"
+ desc = "A medium sized robot made from cheap parts. It has a homemade weapon welded to it."
icon = 'icons/mob/hivebot.dmi'
icon_state = "basic"
icon_living = "basic"
- icon_dead = "basic"
+ icon_dead = "basicDead"
health = 15
maxHealth = 15
- melee_damage_lower = 2
- melee_damage_upper = 3
+ melee_damage_lower = 5
+ melee_damage_upper = 8
attacktext = "рвёт"
- attack_sound = 'sound/weapons/bladeslice.ogg'
- projectilesound = 'sound/weapons/gunshots/gunshot.ogg'
+ attack_sound = 'sound/weapons/throwhard.ogg'
+ projectilesound = 'sound/weapons/gunshots/1sp_91.ogg'
projectiletype = /obj/projectile/hivebotbullet
faction = list("hivebot")
check_friendly_fire = 1
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
speak_emote = list("states")
- gold_core_spawnable = HOSTILE_SPAWN
loot = list(/obj/effect/decal/cleanable/blood/gibs/robot)
+ butcher_results = list(/obj/item/robot_parts/r_arm, /obj/item/robot_parts/head)
deathmessage = "blows apart!"
bubble_icon = "machine"
- del_on_death = 1
footstep_type = FOOTSTEP_MOB_CLAW
AI_delay_max = 0.5 SECONDS
@@ -36,24 +35,36 @@
)
/mob/living/simple_animal/hostile/hivebot/range
- name = "Hivebot"
- desc = "A smallish robot, this one is armed!"
+ name = "Hivebot Sniper"
+ desc = "The robot is on a four-legged base, with a rifle welded to it."
+ butcher_results = list(/obj/item/robot_parts/l_arm, /obj/item/robot_parts/robot_suit)
+ health = 30
+ maxHealth = 30
ranged = 1
retreat_distance = 5
minimum_distance = 5
/mob/living/simple_animal/hostile/hivebot/rapid
+ name = "Hivebot Gunner"
+ desc = "The robot is on a four-legged base, with an automatic pistol welded to it."
+ butcher_results = list(/obj/item/robot_parts/l_leg, /obj/item/robot_parts/robot_suit)
+ health = 15
+ maxHealth = 15
ranged = 1
- rapid = 3
+ rapid = 5
retreat_distance = 5
minimum_distance = 5
/mob/living/simple_animal/hostile/hivebot/strong
name = "Strong Hivebot"
- desc = "A robot, this one is armed and looks tough!"
+ desc = "The robot is on a four-legged base, this one is armed and looks tough!"
+ butcher_results = list(/obj/item/robot_parts/robot_component/armour, /obj/item/robot_parts/robot_suit)
health = 80
maxHealth = 80
ranged = 1
+ rapid = 1
+ melee_damage_lower = 10
+ melee_damage_upper = 15
/mob/living/simple_animal/hostile/hivebot/death(gibbed)
// Only execute the below if we successfully died
@@ -63,11 +74,13 @@
do_sparks(3, 1, src)
/mob/living/simple_animal/hostile/hivebot/tele//this still needs work
- name = "Beacon"
- desc = "Some odd beacon thing"
+ name = "Production robot"
+ desc = "Looks like this robot has its own mini factory inside."
+ butcher_results = list(/obj/item/rcd, /obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster)
icon = 'icons/mob/hivebot.dmi'
- icon_state = "def_radar-off"
- icon_living = "def_radar-off"
+ icon_state = "Ball"
+ icon_living = "Ball"
+ icon_dead = "BallDead"
health = 200
maxHealth = 200
status_flags = 0
@@ -88,7 +101,7 @@
playsound(src.loc, 'sound/effects/empulse.ogg', 25, 1)
/mob/living/simple_animal/hostile/hivebot/tele/proc/warpbots()
- icon_state = "def_radar"
+ icon_state = "Ball_Anim"
visible_message("The [src] turns on!")
while(bot_amt > 0)
bot_amt--
diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi
index f74523349d0..3dc9cc83844 100644
Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ
diff --git a/icons/mob/clothing/belt.dmi b/icons/mob/clothing/belt.dmi
index 6820c77b78d..a61a8797411 100644
Binary files a/icons/mob/clothing/belt.dmi and b/icons/mob/clothing/belt.dmi differ
diff --git a/icons/mob/clothing/helmet.dmi b/icons/mob/clothing/helmet.dmi
new file mode 100644
index 00000000000..f7daac5c2c3
Binary files /dev/null and b/icons/mob/clothing/helmet.dmi differ
diff --git a/icons/mob/clothing/species/drask/helmet.dmi b/icons/mob/clothing/species/drask/helmet.dmi
index c393f8daaf3..7f9ebf8a01f 100644
Binary files a/icons/mob/clothing/species/drask/helmet.dmi and b/icons/mob/clothing/species/drask/helmet.dmi differ
diff --git a/icons/mob/clothing/species/drask/suit.dmi b/icons/mob/clothing/species/drask/suit.dmi
index b6a59ae54a2..56c6aa68c32 100644
Binary files a/icons/mob/clothing/species/drask/suit.dmi and b/icons/mob/clothing/species/drask/suit.dmi differ
diff --git a/icons/mob/clothing/species/unathi/helmet.dmi b/icons/mob/clothing/species/unathi/helmet.dmi
index 022847c0c5a..f089f73e393 100644
Binary files a/icons/mob/clothing/species/unathi/helmet.dmi and b/icons/mob/clothing/species/unathi/helmet.dmi differ
diff --git a/icons/mob/clothing/species/unathi/suit.dmi b/icons/mob/clothing/species/unathi/suit.dmi
index bd2e1b06f58..b9e9aed606e 100644
Binary files a/icons/mob/clothing/species/unathi/suit.dmi and b/icons/mob/clothing/species/unathi/suit.dmi differ
diff --git a/icons/mob/clothing/species/vox/helmet.dmi b/icons/mob/clothing/species/vox/helmet.dmi
index 2fb432c44a9..48de0fc632c 100644
Binary files a/icons/mob/clothing/species/vox/helmet.dmi and b/icons/mob/clothing/species/vox/helmet.dmi differ
diff --git a/icons/mob/clothing/species/vox/suit.dmi b/icons/mob/clothing/species/vox/suit.dmi
index fd66420f853..49d5e4fb058 100644
Binary files a/icons/mob/clothing/species/vox/suit.dmi and b/icons/mob/clothing/species/vox/suit.dmi differ
diff --git a/icons/mob/clothing/species/vulpkanin/helmet.dmi b/icons/mob/clothing/species/vulpkanin/helmet.dmi
index fcf02ff182c..0b8cbdfbfdf 100644
Binary files a/icons/mob/clothing/species/vulpkanin/helmet.dmi and b/icons/mob/clothing/species/vulpkanin/helmet.dmi differ
diff --git a/icons/mob/clothing/species/vulpkanin/suit.dmi b/icons/mob/clothing/species/vulpkanin/suit.dmi
index 2e4b2738ab2..939895411d5 100644
Binary files a/icons/mob/clothing/species/vulpkanin/suit.dmi and b/icons/mob/clothing/species/vulpkanin/suit.dmi differ
diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi
index c562667fb5e..efd77c47b20 100644
Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ
diff --git a/icons/mob/hivebot.dmi b/icons/mob/hivebot.dmi
index 641ac286aee..0cff61de5c4 100644
Binary files a/icons/mob/hivebot.dmi and b/icons/mob/hivebot.dmi differ
diff --git a/icons/mob/inhands/clothing_lefthand.dmi b/icons/mob/inhands/clothing_lefthand.dmi
index 836eb75f913..08f759a79a2 100644
Binary files a/icons/mob/inhands/clothing_lefthand.dmi and b/icons/mob/inhands/clothing_lefthand.dmi differ
diff --git a/icons/mob/inhands/clothing_righthand.dmi b/icons/mob/inhands/clothing_righthand.dmi
index d9e816b85ad..551d8f08ab0 100644
Binary files a/icons/mob/inhands/clothing_righthand.dmi and b/icons/mob/inhands/clothing_righthand.dmi differ
diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi
index 045e1f4648c..4caaf855e0a 100755
Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ
diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi
index 6cddfdcfc2e..7d69ec04dca 100755
Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ
diff --git a/icons/obj/tank.dmi b/icons/obj/tank.dmi
index cc81a9d80d6..6ae6b96cafa 100644
Binary files a/icons/obj/tank.dmi and b/icons/obj/tank.dmi differ