Skip to content

Commit

Permalink
Introduce Moebius voidsuit (#5454)
Browse files Browse the repository at this point in the history
* initial commit

* quick follow-up because I'm bad and can't stage all the files

* last one I promise

* missed a few pixels

* "a few"

* "revert" trash pool

* HELMETS

* platinum

* add a commentary to the helmet pick

what "if" someone'll stumble upon it and introduce an actualy color select?

* while scrolling through a list of my messages searching for a video i p-

osted before I noticed the message with the suit and a mis-matched pixel in it so I fixed it, it was on the shoulder

Co-authored-by: Firefox <space.firefox13@gmail.com>
  • Loading branch information
Firefox13 and Firefox13 authored Sep 20, 2020
1 parent cb2fcd8 commit a75dee2
Show file tree
Hide file tree
Showing 9 changed files with 60 additions and 19 deletions.
50 changes: 35 additions & 15 deletions code/modules/clothing/spacesuits/void/station.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
armor = list(
melee = 35,
bullet = 30,
energy =30,
energy = 30,
bomb = 40,
bio = 100,
rad = 100
Expand Down Expand Up @@ -206,39 +206,59 @@

//Science
/obj/item/clothing/head/space/void/science
name = "Moebius Contractor Helmet"
name = "Moebius combat Helmet"
desc = "A special helmet designed for work in a hazardous, low pressure environment. Has an additional layer of armor."
icon_state = "assaulthelm"
item_state = "assaulthelm"
icon_state = "moebiushelmb"
item_state = "moebiushelmb"
item_state_slots = list(
slot_l_hand_str = "assaulthelm",
slot_r_hand_str = "assaulthelm",
)

matter = list(
MATERIAL_PLASTEEL = 5,
MATERIAL_STEEL = 5,
MATERIAL_GLASS = 5
)
price_tag = 200
armor = list(
melee = 35,
bullet = 40,
energy = 30,
bomb = 25,
melee = 40,
bullet = 35,
energy = 45,
bomb = 30,
bio = 100,
rad = 75
)
siemens_coefficient = 0.4
light_overlay = "helmet_light_dual"

/obj/item/clothing/head/space/void/science
var/list/icon_states = list("moebiushelmb","moebiushelmr", "moebiushelmp","moebiushelmg", "moebiushelmy", "moebiushelmw") //TODO: a manual selection anytime.

/obj/item/clothing/head/space/void/science/New()
..()
icon_state = pick(icon_states)

/obj/item/clothing/suit/space/void/science
name = "Moebius Contractor Power Armor"
icon_state = "assaultsuit"
desc = "A power armor designed by Moebius for contractor work. Features near impeccable armor."
item_state = "assaultsuit"
name = "Moebius combat voidsuit"
icon_state = "moebiussuit"
desc = "A heavy space suit designed by Moebius personnel for work in hazardous environment. Features several advanced layers of armor."
item_state = "moebiussuit"
matter = list(
MATERIAL_PLASTEEL = 15,
MATERIAL_STEEL = 10,
MATERIAL_PLASTIC = 10,
MATERIAL_PLATINUM = 5
)
armor = list(
melee = 40,
bullet = 50,
energy = 40,
bullet = 35,
energy = 45,
bomb = 30,
bio = 100,
rad = 75
)
origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 4)
price_tag = 1200
siemens_coefficient = 0.4
helmet = /obj/item/clothing/head/space/void/science

Expand Down
6 changes: 6 additions & 0 deletions code/modules/research/designs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,12 @@ other types of metals and chemistry for reagents).
chemicals = list("radium" = 5, "phosphorus" = 10)
materials = list(MATERIAL_GLASS = 2, MATERIAL_PLASTIC = 15)

/datum/design/research/item/science_voidsuit
name = "Moebius combat voidsuit"
build_path = /obj/item/clothing/suit/space/void/science
sort_string = "VASAC"


//Why is there a science design to craft a cardboard box full of things? That is not how this works
/*
/datum/design/research/item/chameleon
Expand Down
21 changes: 17 additions & 4 deletions code/modules/research/nodes/combat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@
icon = "recharger"

required_technologies = list(
/datum/technology/basic_combat
)
/datum/technology/basic_nonlethal)
required_tech_levels = list()
cost = 1000

Expand Down Expand Up @@ -139,11 +138,11 @@
y = 0.4
icon = "toxincoater"

required_technologies = list(/datum/technology/exotic_weaponry)
required_technologies = list(/datum/technology/adv_exotic_weaponry)
required_tech_levels = list()
cost = 4000

unlocks_designs = list(
unlocks_designs = list(
/datum/design/research/item/weapon/gunmod/battery_shunt,
/datum/design/research/item/weapon/gunmod/overdrive,
/datum/design/research/item/weapon/gunmod/honker,
Expand Down Expand Up @@ -205,3 +204,17 @@

unlocks_designs = list(/datum/design/research/item/weapon/nuclear_gun, /datum/design/research/item/weapon/lasercannon)

/datum/technology/advanced_armor
name = "Advanced Armor Solutions"
desc = "Advanced voidsuit with combined ballistic and ablative plating."
tech_type = RESEARCH_COMBAT

x = 0.8
y = 0.5
icon = "moebiushelm"

required_technologies = list(/datum/technology/laser_weaponry)
required_tech_levels = list()
cost = 2500
unlocks_designs = list(/datum/design/research/item/science_voidsuit)

Binary file modified icons/inventory/head/icon.dmi
Binary file not shown.
Binary file modified icons/inventory/head/mob.dmi
Binary file not shown.
Binary file modified icons/inventory/suit/icon.dmi
Binary file not shown.
Binary file modified icons/inventory/suit/mob.dmi
Binary file not shown.
2 changes: 2 additions & 0 deletions nano/css/shared.css
Original file line number Diff line number Diff line change
Expand Up @@ -871,6 +871,7 @@ th.bot {
.icon-monitoring { background-position: -160px 0px; }
.icon-rd { background-position: -192px 0px; }
.icon-tesla { background-position: -224px 0px; }
.icon-mob { background-position: -32px 0px; }

.icon-spaceheater { background-position: 0px -32px; }
.icon-pda { background-position: -32px -32px; }
Expand Down Expand Up @@ -964,6 +965,7 @@ th.bot {
.icon-mindswapper { background-position: -160px -320px; }
.icon-holdingpouch { background-position: -192px -320px; }
.icon-spiderlegs { background-position: -224px -320px; }
.icon-moebiushelm { background-position: -256px -320px; }

.sciMenuButton {
width: 300px;
Expand Down
Binary file modified nano/images/science.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit a75dee2

Please sign in to comment.