First pass on custom loadouts.

This commit is contained in:
Zuhayr
2014-06-25 15:47:38 +09:30
parent 46cc33b32c
commit 515e78f760
4 changed files with 64 additions and 5 deletions
+1
View File
@@ -739,6 +739,7 @@
#include "code\modules\client\client defines.dm"
#include "code\modules\client\client procs.dm"
#include "code\modules\client\preferences.dm"
#include "code\modules\client\preferences_gear.dm"
#include "code\modules\client\preferences_savefile.dm"
#include "code\modules\client\preferences_toggles.dm"
#include "code\modules\clothing\clothing.dm"
+4 -2
View File
@@ -73,8 +73,9 @@ datum/preferences
var/r_eyes = 0 //Eye color
var/g_eyes = 0 //Eye color
var/b_eyes = 0 //Eye color
var/species = "Human"
var/species = "Human" //Species datum to use.
var/language = "None" //Secondary language
var/datum/gear //Custom/fluff item loadout.
//Mob preview
var/icon/preview_icon = null
@@ -104,7 +105,6 @@ datum/preferences
// maps each organ to either null(intact), "cyborg" or "amputated"
// will probably not be able to do this for head and torso ;)
var/list/organ_data = list()
var/list/player_alt_titles = new() // the default name of a job like "Medical Doctor"
var/flavor_text = ""
@@ -132,6 +132,8 @@ datum/preferences
gender = pick(MALE, FEMALE)
real_name = random_name(gender)
gear = new /datum/gear()
/datum/preferences
proc/ZeroSkills(var/forced = 0)
for(var/V in SKILLS) for(var/datum/skill/S in SKILLS[V])
+43
View File
@@ -0,0 +1,43 @@
/datum/gear
display_name
display_icon //Icon for preview.
display_icon_name //Icon state for preview.
path //Path to item.
cost //Number of points used.
//Standard gear datums.
/datum/gear/tie_horrible
display_name = "Horrible tie"
display_icon = 'icons/obj/clothing/ties.dmi'
display_icon_name = "horribletie"
path = /obj/item/clothing/tie/horrible
cost = 2
//Species-specific gear datums.
/datum/gear/zhan_furs
display_name = "Zhan-Khazan furs"
display_icon = ''
display_icon_name = "zhan_furs"
path = /obj/item/clothing/suit/tajaran/furs
cost = 3
/datum/gear/zhan_scarf
display_name = "Zhan-Khazan headscarf"
display_icon = ''
display_icon_name = "zhan_scarf"
path = /obj/item/clothing/head/tajaran/scarf
cost = 2
/datum/gear/unathi_robe
display_name = "Roughspun robe"
display_icon = ''
display_icon_name = ""
path =
cost = 3
/datum/gear/unathi_mantle
display_name = "Hide mantle"
display_icon = ''
display_icon_name = ""
path =
cost = 2
+16 -3
View File
@@ -28,7 +28,7 @@
var/heat_level_1 = 360 // Heat damage level 1 above this point.
var/heat_level_2 = 400 // Heat damage level 2 above this point.
var/heat_level_3 = 1000 // Heat damage level 2 above this point.
var/body_temperature = 310.15 //non-IS_SYNTHETIC species will try to stabilize at this temperature. (also affects temperature processing)
var/synth_temp_gain = 0 //IS_SYNTHETIC species will gain this much temperature every second
@@ -52,6 +52,9 @@
var/race_key = 0
var/icon/icon_template
//Used for character generation fluff items.
var/list/custom_gear_options
/datum/species/New()
unarmed = new unarmed_type()
@@ -137,6 +140,11 @@
flesh_color = "#34AF10"
custom_gear_options = list(
"Unathi robe" = /obj/item/clothing/suit/unathi/robe,
"Unathi mantle" = /obj/item/clothing/suit/unathi/mantle
)
/datum/species/tajaran
name = "Tajaran"
icobase = 'icons/mob/human_races/r_tajaran.dmi'
@@ -161,6 +169,11 @@
flesh_color = "#AFA59E"
custom_gear_options = list(
/obj/item/clothing/head/tajaran/scarf
/obj/item/clothing/suit/tajaran/furs
)
/datum/species/skrell
name = "Skrell"
icobase = 'icons/mob/human_races/r_skrell.dmi'
@@ -331,7 +344,7 @@
heat_level_1 = 500 //gives them about 25 seconds in space before taking damage
heat_level_2 = 1000
heat_level_3 = 2000
synth_temp_gain = 10 //this should cause IPCs to stabilize at ~80 C in a 20 C environment.
flags = IS_WHITELISTED | NO_BREATHE | NO_SCAN | NO_BLOOD | NO_PAIN | IS_SYNTHETIC
@@ -348,7 +361,7 @@
var/miss_sound = 'sound/weapons/punchmiss.ogg'
var/sharp = 0
var/edge = 0
/datum/unarmed_attack/punch
attack_verb = list("punch")