cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 13:05:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Skrell suit update (#4246)

Browse Source 
You now must detach helmets from suits to refit them.
Skrellian spacesuits are now voidsuits, allowing you to attach helmets and magboots to them.
This commit is contained in:
Ezuo
2018-02-19 21:40:49 +01:00
committed by Werner
parent 089cc9de0c
commit 99aa331b3b
9 changed files with 72 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystems/traumas.dm
+2 -2
View File
@@ -73,8 +73,8 @@ var/datum/controller/subsystem/traumas/SStraumas
/obj/item/clothing/suit/unathi/robe, /obj/structure/sign/flag/hegemony, /obj/item/stack/material/animalhide/lizard,
/obj/item/toy/plushie/lizard)),
"skrell" = typecacheof(list(/obj/structure/sign/flag/jargon, /obj/item/clothing/ears/skrell, /obj/item/clothing/suit/space/skrell,
/obj/item/clothing/head/helmet/space/skrell, /obj/item/organ/brain/skrell, /obj/item/organ/eyes/skrell,
"skrell" = typecacheof(list(/obj/structure/sign/flag/jargon, /obj/item/clothing/ears/skrell, /obj/item/clothing/suit/space/void/skrell,
/obj/item/clothing/head/helmet/space/void/skrell, /obj/item/organ/brain/skrell, /obj/item/organ/eyes/skrell,
/obj/item/organ/heart/skrell, /obj/item/organ/kidneys/skrell, /obj/item/organ/liver/skrell, /obj/item/organ/lungs/skrell,
/obj/item/weapon/reagent_containers/food/snacks/skrellsnacks)),
code/game/machinery/suit_storage_unit.dm
+12
View File
@@ -868,6 +868,18 @@
else if(href_list["apply_paintjob"])
if(!suit && !helmet) return
if(suit && suit.helmet)
to_chat(usr, "<span class='alert'>\The [src] cannot function while a helmet is attached to the suit!</span>")
return
var/list/no_refit
if (helmet && !helmet.refittable)
LAZYADD(no_refit, helmet)
if (suit && !suit.refittable)
LAZYADD(no_refit, suit)
if (LAZYLEN(no_refit))
to_chat(usr, "<span class='alert'>\The [english_list(no_refit)] in [src] [no_refit.len == 1 ? "is" : "are"] not refittable!</span>")
return
active = 1
spawn(100)
apply_paintjob()
code/game/objects/items/devices/modkit.dm
+1 -1
View File
@@ -33,7 +33,7 @@
allowed = 1
var/obj/item/clothing/I = O
if (!istype(I) || !allowed)
if (!istype(I) || !allowed || !I.refittable)
user << "<span class='notice'>[src] is unable to modify that.</span>"
return
code/modules/clothing/clothing.dm
+1
View File
@@ -24,6 +24,7 @@
var/unbreakable = FALSE
var/default_material = null // Set this to something else if you want material attributes on init.
var/material_armor_modifer = 1 // Adjust if you want seperate types of armor made from the same material to have different protectiveness (e.g. makeshift vs real armor)
var/refittable = TRUE // If false doesn't let the clothing be refit in suit cyclers
/obj/item/clothing/Initialize(var/mapload, var/material_key)
code/modules/clothing/spacesuits/alien.dm
+8 -6
View File
@@ -1,19 +1,20 @@
//Skrell space gear. Sleek like a wetsuit.
/obj/item/clothing/head/helmet/space/skrell
/obj/item/clothing/head/helmet/space/void/skrell
name = "skrellian helmet"
desc = "Smoothly contoured and polished to a shine. Still looks like a fishbowl."
armor = list(melee = 20, bullet = 20, laser = 50,energy = 50, bomb = 50, bio = 100, rad = 100)
max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE
species_restricted = list("Skrell","Human")
siemens_coefficient = 0.4
refittable = FALSE
/obj/item/clothing/head/helmet/space/skrell/white
/obj/item/clothing/head/helmet/space/void/skrell/white
icon_state = "skrell_helmet_white"
/obj/item/clothing/head/helmet/space/skrell/black
/obj/item/clothing/head/helmet/space/void/skrell/black
icon_state = "skrell_helmet_black"
/obj/item/clothing/suit/space/skrell
/obj/item/clothing/suit/space/void/skrell
name = "skrellian voidsuit"
desc = "Seems like a wetsuit with reinforced plating seamlessly attached to it. Very chic."
armor = list(melee = 20, bullet = 20, laser = 50,energy = 50, bomb = 50, bio = 100, rad = 100)
@@ -22,12 +23,13 @@
max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE
species_restricted = list("Skrell","Human")
siemens_coefficient = 0.4
refittable = FALSE
/obj/item/clothing/suit/space/skrell/white
/obj/item/clothing/suit/space/void/skrell/white
icon_state = "skrell_suit_white"
item_state = "skrell_suit_white"
/obj/item/clothing/suit/space/skrell/black
/obj/item/clothing/suit/space/void/skrell/black
icon_state = "skrell_suit_black"
item_state = "skrell_suit_black"
code/modules/item_worth/worths_list.dm
+2 -2
View File
@@ -474,7 +474,7 @@ var/list/worths = list(
/obj/item/clothing/suit/space/void/security = 3000,
/obj/item/clothing/suit/space/void = 2800,
/obj/item/clothing/suit/space/syndicate = 2200,
/obj/item/clothing/suit/space/skrell = 1500,
/obj/item/clothing/suit/space/void/skrell = 3000,
/obj/item/clothing/suit/space/vox = 1000,
/obj/item/clothing/suit/space/cult = 1050,
/obj/item/clothing/suit/space/emergency = 150,
@@ -547,7 +547,7 @@ var/list/worths = list(
/obj/item/clothing/head/helmet/space/syndicate = 1200,
/obj/item/clothing/head/helmet/space/deathsquad = 2400,
/obj/item/clothing/head/helmet/space/vox = 1200,
/obj/item/clothing/head/helmet/space/skrell = 1200,
/obj/item/clothing/head/helmet/space/void/skrell = 1200,
/obj/item/clothing/head/helmet/space/cult = 1300,
/obj/item/clothing/head/helmet/space/emergency = 250,
/obj/item/clothing/head/helmet/space = 450,
html/changelogs/ezuo_skrellsuits.yml
+38
View File
@@ -0,0 +1,38 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
#################################
# Your name.
author: Ezuo
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- tweak: "You now must detach helmets from suits to refit them."
- rscadd: "Skrellian spacesuits are now voidsuits, allowing you to attach helmets and magboots to them."
maps/aurora/aurora-4_mainlevel.dmm
+4 -4
View File
@@ -25213,12 +25213,12 @@
dir = 8;
layer = 2.9
},
/obj/item/clothing/head/helmet/space/skrell/black,
/obj/item/clothing/head/helmet/space/void/skrell/black,
/obj/item/clothing/mask/breath,
/obj/item/clothing/suit/space/skrell/black,
/obj/item/clothing/head/helmet/space/skrell/white,
/obj/item/clothing/suit/space/void/skrell/black,
/obj/item/clothing/head/helmet/space/void/skrell/white,
/obj/item/clothing/mask/breath,
/obj/item/clothing/suit/space/skrell/white,
/obj/item/clothing/suit/space/void/skrell/white,
/obj/machinery/light/small{
dir = 4
},
maps/exodus/exodus-1_station.dmm
+4 -4
View File
@@ -19239,12 +19239,12 @@
dir = 8;
layer = 2.9
},
/obj/item/clothing/head/helmet/space/skrell/black,
/obj/item/clothing/head/helmet/space/void/skrell/black,
/obj/item/clothing/mask/breath,
/obj/item/clothing/suit/space/skrell/black,
/obj/item/clothing/head/helmet/space/skrell/white,
/obj/item/clothing/suit/space/void/skrell/black,
/obj/item/clothing/head/helmet/space/void/skrell/white,
/obj/item/clothing/mask/breath,
/obj/item/clothing/suit/space/skrell/white,
/obj/item/clothing/suit/space/void/skrell/white,
/turf/simulated/floor/tiled/dark,
/area/ai_monitored/storage/eva)
"aIC" = (