cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-11 07:59:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

merge conflict

Browse Source
This commit is contained in:
Dip
2020-10-18 16:54:22 -03:00
parent 6163b7c963 7586bd96c6
commit 9b7eee0a89
32 changed files with 573 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__HELPERS/cmp.dm
+18
View File
@@ -81,3 +81,21 @@ GLOBAL_VAR_INIT(cmp_field, "name")
/proc/cmp_advdisease_resistance_asc(datum/disease/advance/A, datum/disease/advance/B)
return A.totalResistance() - B.totalResistance()
/proc/cmp_quirk_asc(datum/quirk/A, datum/quirk/B)
var/a_sign = num2sign(initial(A.value) * -1)
var/b_sign = num2sign(initial(B.value) * -1)
// Neutral traits go last
if(a_sign == 0)
a_sign = 2
if(b_sign == 0)
b_sign = 2
var/a_name = initial(A.name)
var/b_name = initial(B.name)
if(a_sign != b_sign)
return a_sign - b_sign
else
return sorttext(b_name, a_name)
code/__HELPERS/unsorted.dm
+8
View File
@@ -1564,3 +1564,11 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
for(var/i in L)
if(condition.Invoke(i))
. |= i
/proc/num2sign(numeric)
if(numeric > 0)
return 1
else if(numeric < 0)
return -1
else
return 0
code/controllers/subsystem/processing/quirks.dm
+4 -1
View File
@@ -19,7 +19,10 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
return ..()
/datum/controller/subsystem/processing/quirks/proc/SetupQuirks()
for(var/V in subtypesof(/datum/quirk))
// Sort by Positive, Negative, Neutral; and then by name
var/list/quirk_list = sortList(subtypesof(/datum/quirk), /proc/cmp_quirk_asc)
for(var/V in quirk_list)
var/datum/quirk/T = V
quirks[initial(T.name)] = T
quirk_points[initial(T.name)] = initial(T.value)
code/datums/ruins/lavaland.dm
-8
View File
@@ -194,14 +194,6 @@
allow_duplicates = FALSE
cost = 10
/datum/map_template/ruin/lavaland/duohermit
name = "Makeshift Big Shelter"
id = "duohermitcave"
description = "A place of shelter for a couple of stranded hermits, scraping by to live another day."
suffix = "lavaland_surface_duohermit.dmm"
allow_duplicates = FALSE
cost = 5
/datum/map_template/ruin/lavaland/hermit
name = "Makeshift Shelter"
id = "hermitcave"
code/datums/traits/good.dm
-60
View File
@@ -276,63 +276,3 @@
/datum/quirk/slimespeaker/remove()
var/mob/living/M = quirk_holder
M.remove_language(/datum/language/slime)
/datum/quirk/narsianspeaker
name = "Nar-Sian speaker"
desc = "Obsessed with forbidden knowledge regarding the blood cult, you've learned how to speak their ancient language."
value = 1
gain_text = "<span class='notice'>Your mind feels sensitive to the slurred, ancient language of Nar'Sian cultists.</span>"
lose_text = "<span class='notice'>You forget how to speak Nar'Sian!</span>"
/datum/quirk/narsianspeaker/add()
var/mob/living/M = quirk_holder
M.grant_language(/datum/language/narsie)
/datum/quirk/narsianspeaker/remove()
var/mob/living/M = quirk_holder
M.remove_language(/datum/language/narsie)
/datum/quirk/ratvarianspeaker
name = "Ratvarian speaker"
desc = "Obsessed with the inner workings of the clock cult, you've learned how to speak their language."
value = 1
gain_text = "<span class='notice'>Your mind feels sensitive to the ancient language of Ratvarian cultists.</span>"
lose_text = "<span class='notice'>You forget how to speak Ratvarian!</span>"
/datum/quirk/ratvarianspeaker/add()
var/mob/living/M = quirk_holder
M.grant_language(/datum/language/ratvar)
/datum/quirk/ratvarianspeaker/remove()
var/mob/living/M = quirk_holder
M.remove_language(/datum/language/ratvar)
/datum/quirk/encodedspeaker
name = "Encoded Audio speaker"
desc = "You've been augmented with language encoders, allowing you to understand encoded audio."
value = 1
gain_text = "<span class='notice'>Your mouth feels a little weird for a moment as your language encoder kicks in.</span>"
lose_text = "<span class='notice'>You feel your encoded audio chip malfunction. You can no longer speak or understand the language of fax machines.</span>"
/datum/quirk/encodedspeaker/add()
var/mob/living/M = quirk_holder
M.grant_language(/datum/language/machine)
/datum/quirk/encodedspeaker/remove()
var/mob/living/M = quirk_holder
M.remove_language(/datum/language/machine)
/datum/quirk/xenospeaker
name = "Xenocommon speaker"
desc = "Through time observing and interacting with xenos and xeno hybrids, you've learned the intricate hissing patterns of their language."
value = 1
gain_text = "<span class='notice'>You feel that you are now able to hiss in the same way xenomorphs do.</span>"
lose_text = "<span class='notice'>You seem to no longer know how to speak xenocommon.</span>"
/datum/quirk/xenospeaker/add()
var/mob/living/M = quirk_holder
M.grant_language(/datum/language/xenocommon)
/datum/quirk/xenospeaker/remove()
var/mob/living/M = quirk_holder
M.remove_language(/datum/language/xenocommon)
code/datums/traits/neutral.dm
-19
View File
@@ -109,22 +109,3 @@
mob_trait = TRAIT_HEADPAT_SLUT
value = 0
medical_record_text = "Patient seems overly affectionate"
//Skyrat port start
/datum/quirk/alcohol_lightweight
name = "Alcoholic Lightweight"
desc = "Alcohol really goes straight to your head, gotta be careful with what you drink."
value = 0
mob_trait = TRAIT_ALCOHOL_LIGHTWEIGHT
gain_text = "<span class='notice'>You feel woozy thinking of alcohol.</span>"
lose_text = "<span class='notice'>You regain your stomach for drinks.</span>"
//Skyrat port stop
/datum/quirk/cursed_blood
name = "Cursed Blood"
desc = "Your lineage is cursed with the paleblood curse. Best to stay away from holy water... Hell water, on the other hand..."
value = 0
mob_trait = TRAIT_CURSED_BLOOD
gain_text = "<span class='notice'>A curse from a land where men return as beasts runs deep in your blood. Best to stay away from holy water... Hell water, on the other hand...</span>"
lose_text = "<span class='notice'>You feel the weight of the curse in your blood finally gone.</span>"
medical_record_text = "Patient suffers from an unknown type of aversion to holy reagents. Keep them away from a chaplain."
code/game/gamemodes/dynamic/dynamic.dm
+15 -13
View File
@@ -351,8 +351,8 @@ GLOBAL_VAR_INIT(dynamic_chaos_level, 1.5)
if (ruleset.weight)
midround_rules += ruleset
if ("Event")
if(ruleset.weight)
event_rules += ruleset
//if(ruleset.weight)
event_rules += ruleset
for(var/mob/dead/new_player/player in GLOB.player_list)
if(player.ready == PLAYER_READY_TO_PLAY && player.mind)
roundstart_pop_ready++
@@ -644,7 +644,7 @@ GLOBAL_VAR_INIT(dynamic_chaos_level, 1.5)
if (prob(get_injection_chance()))
var/list/drafted_rules = list()
for (var/datum/dynamic_ruleset/midround/rule in midround_rules)
if (rule.acceptable(current_players[CURRENT_LIVING_PLAYERS].len, threat_level) && threat >= rule.cost)
if (rule.acceptable(current_players[CURRENT_LIVING_PLAYERS].len, threat_level))
// Classic secret : only autotraitor/minor roles
if (GLOB.dynamic_classic_secret && !((rule.flags & TRAITOR_RULESET) || (rule.flags & MINOR_RULESET)))
continue
@@ -665,10 +665,10 @@ GLOBAL_VAR_INIT(dynamic_chaos_level, 1.5)
update_playercounts()
var/list/drafted_rules = list()
for (var/datum/dynamic_ruleset/event/rule in event_rules)
if (rule.acceptable(current_players[CURRENT_LIVING_PLAYERS].len, threat_level) && threat >= rule.cost)
if (rule.acceptable(current_players[CURRENT_LIVING_PLAYERS].len, threat_level))
// Classic secret : only autotraitor/minor roles
if (!GLOB.master_mode == "dynamic")
continue
//if (!GLOB.master_mode == "dynamic")
//continue
if (world.time < rule.earliest_start)
continue
if(rule.occurances_current >= rule.occurances_max && rule.occurances_max)
@@ -676,8 +676,9 @@ GLOBAL_VAR_INIT(dynamic_chaos_level, 1.5)
rule.candidates = list()
rule.candidates = current_players.Copy()
rule.trim_candidates()
if (rule.ready() && rule.candidates.len > 0)
drafted_rules[rule] = rule.get_weight()
//if(rule.needs_players)
//if (rule.ready() && rule.candidates.len > 0)
drafted_rules[rule] = rule.get_weight()
if(drafted_rules.len > 0)
picking_midround_latejoin_rule(drafted_rules)
@@ -727,13 +728,14 @@ GLOBAL_VAR_INIT(dynamic_chaos_level, 1.5)
chance += 25-10*(max_pop_per_antag-current_pop_per_antag)
*/
//Hyper change - Base injection chance based on chaos.
chance = (GLOB.dynamic_chaos_level * 10) //Base chance from 0 to 50
chance = (GLOB.dynamic_chaos_level * 12) //Base chance from 0 to 60
if (current_players[CURRENT_DEAD_PLAYERS].len > current_players[CURRENT_LIVING_PLAYERS].len)
chance -= 30 // More than half the crew died? ew, let's calm down on antags
if (threat > 70)
chance += 15
if (threat < 30)
chance -= 15
//if (threat > 70)
// chance += 15
//if (threat < 30)
// chance -= 15
chance += ((threat-40)*0.4) //threat influence injection chance more gradually
if (chance > 100) //I don't know what would happen if we returned a probability greater than 100%
return 100 //So I won't
return round(max(0,chance))
code/game/gamemodes/dynamic/dynamic_rulesets_events.dm
+13 -6
View File
@@ -3,9 +3,10 @@
var/typepath // typepath of the event
var/controller //round event controller for the event - Required for certain events dependendant on variables within their controllers
var/triggering
var/earliest_start = 20 MINUTES
var/earliest_start = 20 MINUTES
var/occurances_current = 0 //Don't touch this. Skyrat Change.
var/occurances_max = 0 //Maximum occurances for this event. Set to 0 to allow an infinite amount of this event. Skyrat change.
var/needs_players = FALSE //If an event needs players, living or ghosts, set to TRUE. Bypasses the trim_candidates otherwise
var/restrict_ghost_roles = TRUE
var/required_type = /mob/living/carbon/human
var/list/living_players = list()
@@ -26,7 +27,7 @@
if (M.mind && M.mind.assigned_role && (M.mind.assigned_role in enemy_roles) && (!(M in candidates) || (M.mind.assigned_role in restricted_roles)))
job_check++ // Checking for "enemies" (such as sec officers). To be counters, they must either not be candidates to that rule, or have a job that restricts them from it
var/threat = round(mode.threat_level/10)
var/threat = max(min(round(mode.threat_level/10),9),1) //min() to stop index errors at 100 threat //Max to stop breaking at 0 threat.
if (job_check < required_enemies[threat])
return FALSE
return ..()
@@ -420,16 +421,22 @@
/datum/dynamic_ruleset/event/operative
name = "Lone Operative"
controller = /datum/round_event_control/operative
typepath = /datum/round_event/ghost_role/operative
required_enemies = list(0,0,0,0,0,0,0,0,0,0)
weight = 0 //This is changed in nuclearbomb.dm
occurances_max = 1
requirements = list(10,5,0,0,0,0,0,0,0,0) //SECURE THAT DISK
cost = 50
/datum/dynamic_ruleset/event/operative/ready()
/datum/dynamic_ruleset/event/operative/get_weight()
var/datum/round_event_control/operative/loneop = locate(/datum/round_event_control/operative) in SSevents.control
if(istype(loneop))
weight = loneop.weight //Get the weight whenever it's called.
to_chat(GLOB.admins, "<span class='adminnotice'>Current LoneOP weight [weight]</span>")
else
to_chat(GLOB.admins, "<span class='adminnotice'>LoneOP is fucking broken.</span>")
return weight
//////////////////////////////////////////////
// //
@@ -463,7 +470,7 @@
cost = 4
requirements = list(101,5,5,1,1,1,1,1,1,1)
high_population_requirement = 10
earliest_start = 10 MINUTES
earliest_start = 0 MINUTES
repeatable = TRUE
//property_weights = list("extended" = 1)
occurances_max = 3
@@ -565,7 +572,7 @@
//config_tag = "radiation_storm"
typepath = /datum/round_event/radiation_storm
cost = 3
weight = 3
weight = 2
repeatable_weight_decrease = 2
enemy_roles = list("Chemist","Chief Medical Officer","Geneticist","Medical Doctor","AI","Captain")
required_enemies = list(1,1,1,1,1,1,1,1,1,1)
@@ -715,7 +722,7 @@
weight = 100
repeatable_weight_decrease = 1 //Slightly drop the weight each time it is called to keep the pool from getting too diluted as the round goes on.
repeatable = TRUE
//occurances_max = 20 //Our rounds can go for a WHILE
occurances_max = 200 //Our rounds can go for a WHILE
/datum/dynamic_ruleset/event/disease_outbreak
name = "Disease Outbreak"
code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm
+1 -2
View File
@@ -31,8 +31,7 @@
continue // Dead players cannot count as opponents
if (M.mind && M.mind.assigned_role && (M.mind.assigned_role in enemy_roles) && (!(M in candidates) || (M.mind.assigned_role in restricted_roles)))
job_check++ // Checking for "enemies" (such as sec officers). To be counters, they must either not be candidates to that rule, or have a job that restricts them from it
var/threat = round(mode.threat_level/10)
var/threat = min(round(mode.threat_level/10),9)
if (job_check < required_enemies[threat])
return FALSE
return ..()
code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm
+108 -2
View File
@@ -100,7 +100,7 @@
if (M.mind && M.mind.assigned_role && (M.mind.assigned_role in enemy_roles) && (!(M in candidates) || (M.mind.assigned_role in restricted_roles)))
job_check++ // Checking for "enemies" (such as sec officers). To be counters, they must either not be candidates to that rule, or have a job that restricts them from it
var/threat = round(mode.threat_level/10)
var/threat = min(round(mode.threat_level/10),9)
if (job_check < required_enemies[threat])
return FALSE
return TRUE
@@ -258,6 +258,112 @@
return TRUE
//////////////////////////////////////////
// //
// LEWD //
// //
//////////////////////////////////////////
/datum/dynamic_ruleset/midround/autotraitor/lewd
name = "Horny Traitor"
persistent = TRUE
antag_flag = ROLE_LEWD_TRAITOR
antag_datum = /datum/antagonist/traitor/lewd
//minimum_required_age = 7
protected_roles = list("AI","Cyborg")
restricted_roles = list("Cyborg","AI")
required_candidates = 1
weight = 2
cost = 0
requirements = list(10,10,10,10,10,10,10,10,10,10)
high_population_requirement = 10
chaos_min = 0.1
chaos_max = 2.5
admin_required = TRUE
//vars for execution
var/list/mob/living/carbon/human/lewd_candidates = list()
var/list/mob/living/carbon/human/targets = list()
var/numTraitors = 1
/datum/dynamic_ruleset/midround/autotraitor/lewd/acceptable(population = 0, threat = 0) //copy paste to bypass parent
if(minimum_players > population)
return FALSE
if(maximum_players > 0 && population > maximum_players)
return FALSE
if(GLOB.dynamic_chaos_level < chaos_min || GLOB.dynamic_chaos_level > chaos_max)
return FALSE
if(admin_required && !GLOB.admins.len)
return FALSE
if (population >= GLOB.dynamic_high_pop_limit)
return (mode.threat_level >= high_population_requirement)
else
pop_per_requirement = pop_per_requirement > 0 ? pop_per_requirement : mode.pop_per_requirement
var/indice_pop = min(10,round(population/pop_per_requirement)+1)
return (mode.threat_level >= requirements[indice_pop])
/datum/dynamic_ruleset/midround/autotraitor/lewd/trim_candidates()
..()
lewd_candidates = living_players
for(var/mob/living/player in lewd_candidates)
if(issilicon(player)) // Your assigned role doesn't change when you are turned into a silicon.
lewd_candidates -= player
continue
if(is_centcom_level(player.z))
lewd_candidates -= player // We don't autotator people in CentCom
continue
if(player.mind && (player.mind.special_role || player.mind.antag_datums?.len > 0))
lewd_candidates -= player // We don't autotator people with roles already
/datum/dynamic_ruleset/midround/autotraitor/lewd/trim_list(list/L = list())
var/list/trimmed_list = L.Copy()
var/antag_name = initial(antag_flag)
for(var/mob/living/M in trimmed_list)
if (!istype(M, required_type))
trimmed_list.Remove(M)
continue
if (!M.client) // Are they connected?
trimmed_list.Remove(M)
continue
if(!mode.check_age(M.client, minimum_required_age))
trimmed_list.Remove(M)
continue
if (!(antag_name in M.client.prefs.be_special) || jobban_isbanned(M.ckey, list(antag_name, ROLE_SYNDICATE)))//are they willing and not antag-banned?
trimmed_list.Remove(M)
continue
if (M.mind)
if (restrict_ghost_roles && M.mind.assigned_role in GLOB.exp_specialmap[EXP_TYPE_SPECIAL]) // Are they playing a ghost role?
trimmed_list.Remove(M)
continue
if (M.mind.assigned_role in restricted_roles) // All this work to bypass mindshield restriction
trimmed_list.Remove(M)
continue
if ((exclusive_roles.len > 0) && !(M.mind.assigned_role in exclusive_roles)) // Is the rule exclusive to their job?
trimmed_list.Remove(M)
continue
return trimmed_list
/datum/dynamic_ruleset/midround/autotraitor/lewd/ready()
for(var/mob/living/target in living_players)
if(target.client.prefs.noncon)
targets += target
if(lewd_candidates.len)
numTraitors = min(lewd_candidates.len, targets.len, numTraitors)
if(numTraitors == 0)
to_chat(GLOB.admins, "No lewd traitors created. Are there any valid targets?")
return 0
return 1
return 0
/datum/dynamic_ruleset/midround/autotraitor/lewd/execute()
var/mob/M = pick(lewd_candidates)
lewd_candidates -= M
assigned += M.mind
var/datum/antagonist/traitor/lewd/newTraitor = new
M.mind.add_antag_datum(newTraitor)
return TRUE
//////////////////////////////////////////////
// //
// Malfunctioning AI //
@@ -268,7 +374,7 @@
name = "Malfunctioning AI"
antag_datum = /datum/antagonist/traitor
antag_flag = ROLE_MALF
enemy_roles = list("Security Officer", "Warden","Detective","Head of Security", "Captain", "Scientist", "Research Director", "Chief Engineer")
enemy_roles = list("Security Officer", "Warden","Detective","Head of Security", "Captain", "Scientist", "Research Director", "Chief Engineer", "Engineer", "Shaft Miner")
exclusive_roles = list("AI")
required_enemies = list(4,4,4,4,4,4,2,2,2,0)
required_candidates = 1
code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm
+24 -14
View File
@@ -61,7 +61,6 @@
mode.picking_specific_rule(/datum/dynamic_ruleset/midround/autotraitor)
*/
/* //Not currently functional
//////////////////////////////////////////
// //
// LEWD //
@@ -77,25 +76,24 @@
protected_roles = list("AI","Cyborg")
restricted_roles = list("Cyborg","AI")
required_candidates = 1
weight = 5
weight = 3
cost = 0
requirements = list(10,10,10,10,10,10,10,10,10,10)
requirements = list(101,10,10,10,10,10,10,10,10,10)
high_population_requirement = 10
chaos_min = 0.1
chaos_max = 2.0
chaos_max = 2.5
admin_required = TRUE
//vars for execution
var/list/mob/living/carbon/human/lewd_candidates = list()
var/numTraitors = 0
var/numTraitors = 1
/datum/dynamic_ruleset/roundstart/traitor/lewd/pre_execute()
/datum/dynamic_ruleset/roundstart/traitor/lewd/ready()
var/list/mob/living/carbon/human/targets = list()
for(var/mob/living/carbon/human/target in GLOB.player_list)
for(var/mob/dead/new_player/target in GLOB.player_list)
if(target.client.prefs.noncon)
if(!(target.job in restricted_roles))
targets += target
targets += target
if(candidates.len)
var/numTraitors = min(candidates.len, targets.len, 1) //This number affects the maximum number of traitors. We want 1 for right now.
@@ -105,14 +103,26 @@
return 1
return 0
/datum/dynamic_ruleset/roundstart/traitor/lewd/pre_execute()
var/traitor_scaling_coeff = 10 - max(0,round(mode.threat_level/10)-5) // Above 50 threat level, coeff goes down by 1 for every 10 levels
var/num_traitors = min(round(mode.candidates.len / traitor_scaling_coeff) + 1, candidates.len)
for (var/i = 1 to num_traitors)
var/mob/M = pick(candidates)
candidates -= M
assigned += M.mind
M.mind.special_role = ROLE_LEWD_TRAITOR
M.mind.restricted_roles = restricted_roles
return TRUE
/*
/datum/dynamic_ruleset/roundstart/traitor/lewd/execute()
var/mob/living/carbon/human/H = null
var/datum/mind/M = null
if(numTraitors)
for(var/i = 0, i<numTraitors, i++)
H = pick(candidates)
candidates.Remove(H)
H.mind.make_LewdTraitor()
M = pick(assigned)
assigned.Remove(M)
M.make_LewdTraitor()
return TRUE
return FALSE
*/
@@ -350,7 +360,7 @@
high_population_requirement = 10
pop_per_requirement = 5
flags = HIGHLANDER_RULESET
var/operative_cap = list(2,2,2,2,2,3,3,3,4,5)
var/operative_cap = list(1,1,1,2,2,3,3,3,4,5)
var/datum/team/nuclear/nuke_team
chaos_min = 4.0
code/game/objects/items/storage/belt.dm
+82 -21
View File
@@ -474,32 +474,93 @@ obj/item/storage/belt/slut/ComponentInitialize()
STR.max_combined_w_class = 32
STR.max_w_class = WEIGHT_CLASS_NORMAL
STR.can_hold = typecacheof(list(
/obj/item/ammo_box,
/obj/item/ammo_casing/shotgun,
/obj/item/analyzer,
/obj/item/assembly/flash/handheld,
/obj/item/assembly/mousetrap,
/obj/item/assembly/signaler,
/obj/item/bikehorn/rubberducky,
/obj/item/cautery,
/obj/item/circular_saw,
/obj/item/clothing/glasses,
/obj/item/clothing/gloves,
/obj/item/clothing/mask/breath,
/obj/item/clothing/mask/breath/medical,
/obj/item/clothing/mask/muzzle,
/obj/item/clothing/mask/surgical,
/obj/item/clothing/neck/stethoscope,
/obj/item/construction/rcd,
/obj/item/crowbar,
/obj/item/dnainjector,
/obj/item/extinguisher/mini,
/obj/item/flashlight,
/obj/item/flashlight/pen,
/obj/item/flashlight/seclite,
/obj/item/forcefield_projector,
/obj/item/geiger_counter,
/obj/item/grenade,
/obj/item/grenade/chem_grenade,
/obj/item/grenade/chem_grenade/metalfoam,
/obj/item/grenade/chem_grenade/smart_metal_foam,
/obj/item/gun/syringe/syndicate,
/obj/item/healthanalyzer,
/obj/item/hemostat,
/obj/item/holosign_creator,
/obj/item/holosign_creator/atmos,
/obj/item/holosign_creator/engineering,
/obj/item/hypospray/mkii,
/obj/item/implant,
/obj/item/implantcase,
/obj/item/implanter,
/obj/item/key/janitor,
/obj/item/kitchen/knife/combat,
/obj/item/lazarus_injector,
/obj/item/lighter,
/obj/item/lightreplacer,
/obj/item/melee/baton,
/obj/item/melee/classic_baton,
/obj/item/melee/classic_baton/telescopic,
/obj/item/melee/flyswatter,
/obj/item/multitool,
/obj/item/paint/paint_remover,
/obj/item/pinpointer/crew,
/obj/item/pipe_dispenser,
/obj/item/radio,
/obj/item/rcd_ammo,
/obj/item/reagent_containers/blood,
/obj/item/reagent_containers/dropper,
/obj/item/reagent_containers/food/snacks/donut,
/obj/item/reagent_containers/glass/beaker,
/obj/item/reagent_containers/glass/bottle,
/obj/item/reagent_containers/hypospray,
/obj/item/reagent_containers/medspray,
/obj/item/reagent_containers/pill,
/obj/item/reagent_containers/spray,
/obj/item/reagent_containers/spray/pepper,
/obj/item/reagent_containers/syringe,
/obj/item/restraints/handcuffs,
/obj/item/restraints/legcuffs/bola,
/obj/item/retractor,
/obj/item/scalpel,
/obj/item/screwdriver,
/obj/item/sensor_device,
/obj/item/soap,
/obj/item/stack/cable_coil,
/obj/item/stack/medical,
/obj/item/stack/rods,
/obj/item/stack/tile/plasteel,
/obj/item/stamp,
/obj/item/storage/fancy/cigarettes,
/obj/item/storage/pill_bottle,
/obj/item/surgical_drapes, //for true paramedics
/obj/item/surgicaldrill,
/obj/item/t_scanner,
/obj/item/tank/internals/emergency_oxygen,
/obj/item/weldingtool,
/obj/item/wirecutters,
/obj/item/wrench,
/obj/item/multitool,
/obj/item/flashlight,
/obj/item/stack/cable_coil,
/obj/item/t_scanner,
/obj/item/analyzer,
/obj/item/geiger_counter,
/obj/item/extinguisher/mini,
/obj/item/radio,
/obj/item/clothing/gloves,
/obj/item/holosign_creator/atmos,
/obj/item/holosign_creator/engineering,
/obj/item/forcefield_projector,
/obj/item/assembly/signaler,
/obj/item/lightreplacer,
/obj/item/rcd_ammo,
/obj/item/construction/rcd,
/obj/item/pipe_dispenser,
/obj/item/stack/rods,
/obj/item/stack/tile/plasteel,
/obj/item/grenade/chem_grenade/metalfoam,
/obj/item/grenade/chem_grenade/smart_metal_foam
/obj/item/wrench/medical
))
/obj/item/storage/belt/grenade
code/game/objects/structures/ghost_role_spawners.dm
-106
View File
@@ -251,112 +251,6 @@
new/obj/structure/fluff/empty_cryostasis_sleeper(get_turf(src))
return ..()
//Duo malfunctioning cryostasis sleepers: Spawns in big makeshift shelters in lavaland.
/obj/effect/mob_spawn/human/duohermit
name = "malfunctioning cryostasis sleeper"
desc = "A humming sleeper with a silhouetted occupant inside. Its stasis function is broken and it's likely being used as a bed."
mob_name = "a stranded hermit"
job_description = "Lavaland Hermit"
icon = 'icons/obj/lavaland/spawners.dmi'
icon_state = "cryostasis_sleeper"
roundstart = FALSE
death = FALSE
random = TRUE
mob_species = /datum/species/human
flavour_text = "<span class='big bold'>You and another have been stranded in this planet for quite some time now.</span><b> Each day you barely scrape by, and between the terrible \
conditions of your makeshift shelter, the hostile creatures, and the ash drakes swooping down from the cloudless skies, all you can wish for is the feel of soft grass between your toes and \
the fresh air of Earth. These thoughts are dispelled by yet another recollection of how you and your friend got here... "
assignedrole = "Hermit"
mirrorcanloadappearance = TRUE
/obj/effect/mob_spawn/human/duohermit/Initialize(mapload)
. = ..()
var/arrpee = rand(1,3)
switch(arrpee)
if(1)
flavour_text += "you were an intern at a rather odd deep space facility. You weren't quite sure how things worked or what they were doing there, but it was your first day on the \
job. A day that was abruptly interrupted by gunfire and alarms. Luckily enough, your handy crowbar skills managed to get you to an escape pod before it was too late.</b>"
outfit.uniform = /obj/item/clothing/under/assistantformal
outfit.shoes = /obj/item/clothing/shoes/sneakers/black
outfit.back = /obj/item/storage/backpack
if(2)
flavour_text += "you were a volunteer test subject for a state of the art deep space facility. You didn't care much about who you were working with, but in the end, the paycheck \
was really, really good. To this day, you're not quite sure which sort of prototype implants were used on you, as you seem to remember little but the headache that struck you once \
the escape pod finally hit the ground and your seatbelt failed to keep you buckled.</b>"
outfit.uniform = /obj/item/clothing/under/rank/scientist
outfit.suit = /obj/item/clothing/suit/toggle/labcoat
outfit.shoes = /obj/item/clothing/shoes/sneakers/black
outfit.back = /obj/item/storage/backpack
if(3)
flavour_text += "you were a doctor at a state of the art deep space facility. For who exactly you were conducting research for, not even you are quite sure. Only that the paycheck \
at the end of the month was good enough. In the end, when said facility was attacked by Nanotransen, you and another were the only ones to have made it out alive. Or so it seemed.</b>"
outfit.uniform = /obj/item/clothing/under/rank/medical
outfit.suit = /obj/item/clothing/suit/toggle/labcoat
outfit.back = /obj/item/storage/backpack/medic
outfit.shoes = /obj/item/clothing/shoes/sneakers/black
/obj/effect/mob_spawn/human/duohermit/Destroy()
new/obj/structure/fluff/empty_cryostasis_sleeper(get_turf(src))
return ..()
//Exiles: Stranded exiles that have been left in Snowdin. Can be easily adapted for other roles as well.
/obj/effect/mob_spawn/human/exiled
name = "used bed"
desc = "Still warm."
mob_name = "exiled"
job_description = "Exiles"
icon = 'icons/obj/objects.dmi'
icon_state = "bed"
roundstart = FALSE
death = FALSE
random = TRUE
mob_species = /datum/species/human
flavour_text = "As the last escape shuttle left the sector, you were left for dead, stranded in a cold hell where you make do, until hopefully someone finds you. \
Every day, you pause and recollect your memories from before it all happened... "
assignedrole = "Arctic Exile"
mirrorcanloadappearance = TRUE
ghost_usable = FALSE
/obj/effect/mob_spawn/human/exiled/Initialize(mapload)
. = ..()
delayusability(9000, FALSE) //Probably should not show up on the menu? It gives it away that snowdin is the away mission.
var/arrpee = rand(1,3)
switch(arrpee)
if(1)
flavour_text += "You were a lowly engineer, hired by Kinaris to make sure the turbines from their mining operation remained functional. \
You remember the day the mining team descended for the very last time into the depths of the shafts, only to never return. \
The agonizing screams from whatever now haunts those mines still brings a shiver down your spine."
outfit.uniform = /obj/item/clothing/under/rank/engineer
outfit.suit = /obj/item/clothing/suit/hooded/wintercoat/engineering
outfit.shoes = /obj/item/clothing/shoes/sneakers/black
outfit.back = /obj/item/storage/backpack/industrial
outfit.id = /obj/item/card/id/away/snowdin/eng
outfit.implants = list(/obj/item/implant/exile) //Made it so they cannot simply exit through the gateway at will.
if(2)
flavour_text += "You were a plasma researcher, hired by Kinaris to oversee a small research division in a remote, isolated little icy planet, \
you remember the day the mining team descended for the very last time into the depths of the shafts, only to never return. \
While you haven't heard them yourself, reports say the sounds that were heard over radio were likely not of this world."
outfit.uniform = /obj/item/clothing/under/rank/scientist
outfit.suit = /obj/item/clothing/suit/hooded/wintercoat/science
outfit.shoes = /obj/item/clothing/shoes/sneakers/black
outfit.back = /obj/item/storage/backpack/science
outfit.id = /obj/item/card/id/away/snowdin/sci
outfit.implants = list(/obj/item/implant/exile) //Made it so they cannot simply exit through the gateway at will.
if(3)
flavour_text += "You were a junior doctor, hired by Kinaris to oversee the mental state of a plasma mining operation's miners. \
Over and over you reported that the miners were having constant, similar types of hallucinations and that perhaps the whole operation should pause \
until further investigation was concluded, but command shrugged it off as an episode of mass hallucination... Until the miners never came back."
outfit.uniform = /obj/item/clothing/under/rank/medical
outfit.suit = /obj/item/clothing/suit/hooded/wintercoat/medical
outfit.shoes = /obj/item/clothing/shoes/sneakers/black
outfit.back = /obj/item/storage/backpack/medic
outfit.id = /obj/item/card/id/away/snowdin/med
outfit.implants = list(/obj/item/implant/exile) //Made it so they cannot simply exit through the gateway at will.
/obj/effect/mob_spawn/human/exiled/Destroy()
new/obj/structure/bed(get_turf(src))
return ..()
//Broken rejuvenation pod: Spawns in animal hospitals in lavaland. Ghosts become disoriented interns and are advised to search for help.
/obj/effect/mob_spawn/human/doctor/alive/lavaland
name = "broken rejuvenation pod"
code/modules/antagonists/nukeop/nukeop.dm
+2 -1
View File
@@ -36,7 +36,6 @@
var/mob/living/carbon/human/H = owner.current
H.set_species(/datum/species/human) //Plasamen burn up otherwise, and lizards are vulnerable to asimov AIs
H.equipOutfit(nukeop_outfit)
H.checkloadappearance()
return TRUE
/datum/antagonist/nukeop/greet()
@@ -53,6 +52,8 @@
memorize_code()
if(send_to_spawnpoint)
move_to_spawnpoint()
var/mob/living/carbon/human/H = owner.current
H.checkloadappearance()
/datum/antagonist/nukeop/get_team()
return nuke_team
code/modules/clothing/head/soft_caps.dm
+1 -1
View File
@@ -124,7 +124,7 @@
dog_fashion = null
/obj/item/clothing/head/soft/emt
name = "EMT cap"
name = "paramedic cap"
desc = "It's a baseball hat with a dark turquoise color and a reflective cross on the top."
icon_state = "emtsoft"
item_color = "emt"
code/modules/clothing/suits/labcoat.dm
+3 -3
View File
@@ -38,10 +38,10 @@
item_state = "labcoat_cmo"
/obj/item/clothing/suit/toggle/labcoat/emt
name = "\improper EMT's jacket"
desc = "A dark blue jacket with reflective strips for emergency medical technicians."
name = "paramedic's jacket"
desc = "A dark blue jacket for paramedics with reflective stripes."
icon_state = "labcoat_emt"
item_state = "labcoat_cmo"
item_state = "labcoat_emt"
/obj/item/clothing/suit/toggle/labcoat/mad
name = "\proper The Mad's labcoat"
code/modules/clothing/under/jobs/medsci.dm
+18 -1
View File
@@ -204,4 +204,21 @@
item_color = "medical_skirt"
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
fitted = FEMALE_UNIFORM_TOP
fitted = FEMALE_UNIFORM_TOP
/obj/item/clothing/under/rank/medical/emt
desc = "It's made of a special fiber that provides minor protection against biohazards. It has a dark blue cross on the chest denoting that the wearer is a trained paramedic."
name = "paramedic jumpsuit"
icon_state = "emt"
item_state = "w_suit"
item_color = "emt"
/obj/item/clothing/under/rank/medical/emt/skirt
name = "paramedic jumpskirt"
desc = "It's made of a special fiber that provides minor protection against biohazards. It has a dark blue cross on the chest denoting that the wearer is a trained paramedic."
icon_state = "emt_skirt"
item_state = "w_suit"
item_color = "emt_skirt"
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
fitted = FEMALE_UNIFORM_TOP
code/modules/mob/mob_helpers.dm
-28
View File
@@ -506,31 +506,3 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
. = BLOOD_COLOR_BUG
//add more stuff to the switch if you have more blood colors for different types
// the defines are in _DEFINES/misc.dm
mob/proc/checkloadappearance()
var/mob/living/carbon/human/H = src
//This will be where the person gets to select their appearance instead of the random character
if (world.time <= (H.time_initialized + 900) && H.mirrorcanloadappearance == TRUE)
SEND_SOUND(H, 'sound/misc/server-ready.ogg')
to_chat(H, "<span class='boldannounce'>This ghost role allows you to select your loaded character's appearance. Make sure you have your ID in your ID slot, if you have one.</span>")
if(alert(H, "Would you like to load your currently loaded character's appearance?", "This can only be done up until 90s after you spawn.", "Yes", "No") == "Yes" && world.time <= (H.time_initialized + 900))
H.client.prefs.copy_to(H)
if (H.custom_body_size) //Do they have a custom size set?
H.resize(H.custom_body_size * 0.01)
H.real_name = H.client.prefs.real_name
H.mind.name = H.real_name //Makes sure to change their mind name to their real name.
SSquirks.AssignQuirks(H, H.client, TRUE, FALSE, H.job, FALSE)//This Assigns the selected character's quirks
H.dna.update_dna_identity() //This makes sure their DNA is updated.
var/obj/item/card/id/idCard = H.get_idcard() //Time to change their ID card as well if they have one.
if (idCard != null)
idCard.update_label(H.real_name, idCard.assignment)
idCard.registered_name = H.real_name
H.mirrorcanloadappearance = FALSE //Prevents them from using the mirror again.
SEND_SOUND(H, 'sound/magic/charge.ogg') //Fluff
to_chat(H, "<span class='boldannounce'>Your head aches for a second. You feel like this is how things should have been.</span>")
log_game("[key_name(H)] has loaded their default appearance for a ghost role.")
message_admins("[ADMIN_LOOKUPFLW(H)] has loaded their default appearance for a ghost role.")
return
else
to_chat(H, "<span class='boldannounce'>You either took too long or chose not to change. Alrighty. Remember, you have 90 seconds from spawn to get to a mirror and still do it if you wish.</span>")
return
code/modules/projectiles/ammunition/energy/stun.dm
+1 -1
View File
@@ -13,7 +13,7 @@
e_cost = 100
/obj/item/ammo_casing/energy/electrode/hos
e_cost = 200
e_cost = 100
/obj/item/ammo_casing/energy/electrode/old
e_cost = 1000
code/modules/projectiles/guns/energy/energy_gun.dm
+1
View File
@@ -54,6 +54,7 @@
name = "\improper X-01 MultiPhase Energy Gun"
desc = "This is an expensive, modern recreation of an antique laser gun. This gun has several unique firemodes, but lacks the ability to recharge over time."
icon_state = "hoslaser"
cell_type = /obj/item/stock_parts/cell{charge = 1600; maxcharge = 1600; chargerate = 160}
force = 10
ammo_type = list(/obj/item/ammo_casing/energy/electrode/hos, /obj/item/ammo_casing/energy/laser/hos, /obj/item/ammo_casing/energy/disabler)
ammo_x_offset = 4
code/modules/vending/wardrobes.dm
+3
View File
@@ -52,10 +52,13 @@
/obj/item/clothing/under/rank/medical/blue = 2,
/obj/item/clothing/under/rank/medical/green = 2,
/obj/item/clothing/under/rank/medical/purple = 2,
/obj/item/clothing/under/rank/medical/emt = 5,
/obj/item/clothing/under/rank/medical/emt/skirt = 5,
/obj/item/clothing/under/rank/medical = 5,
/obj/item/clothing/suit/toggle/labcoat = 5,
/obj/item/clothing/suit/toggle/labcoat/emt = 5,
/obj/item/clothing/shoes/sneakers/white = 5,
/obj/item/clothing/shoes/sneakers/blue = 5,
/obj/item/clothing/head/soft/emt = 5,
/obj/item/clothing/suit/apron/surgical = 3,
/obj/item/clothing/mask/surgical = 5)
hyperstation/code/datums/ruins/lavaland.dm
+8
View File
@@ -0,0 +1,8 @@
/datum/map_template/ruin/lavaland/duohermit
name = "Makeshift Big Shelter"
id = "duohermitcave"
description = "A place of shelter for a couple of stranded hermits, scraping by to live another day."
suffix = "lavaland_surface_duohermit.dmm"
allow_duplicates = FALSE
never_spawn_with = list(/datum/map_template/ruin/lavaland/hermit)
cost = 5
hyperstation/code/datums/traits/good.dm
+59
View File
@@ -0,0 +1,59 @@
/datum/quirk/narsianspeaker
name = "Nar-Sian speaker"
desc = "Obsessed with forbidden knowledge regarding the blood cult, you've learned how to speak their ancient language."
value = 1
gain_text = "<span class='notice'>Your mind feels sensitive to the slurred, ancient language of Nar'Sian cultists.</span>"
lose_text = "<span class='notice'>You forget how to speak Nar'Sian!</span>"
/datum/quirk/narsianspeaker/add()
var/mob/living/M = quirk_holder
M.grant_language(/datum/language/narsie)
/datum/quirk/narsianspeaker/remove()
var/mob/living/M = quirk_holder
M.remove_language(/datum/language/narsie)
/datum/quirk/ratvarianspeaker
name = "Ratvarian speaker"
desc = "Obsessed with the inner workings of the clock cult, you've learned how to speak their language."
value = 1
gain_text = "<span class='notice'>Your mind feels sensitive to the ancient language of Ratvarian cultists.</span>"
lose_text = "<span class='notice'>You forget how to speak Ratvarian!</span>"
/datum/quirk/ratvarianspeaker/add()
var/mob/living/M = quirk_holder
M.grant_language(/datum/language/ratvar)
/datum/quirk/ratvarianspeaker/remove()
var/mob/living/M = quirk_holder
M.remove_language(/datum/language/ratvar)
/datum/quirk/encodedspeaker
name = "Encoded Audio speaker"
desc = "You've been augmented with language encoders, allowing you to understand encoded audio."
value = 1
gain_text = "<span class='notice'>Your mouth feels a little weird for a moment as your language encoder kicks in.</span>"
lose_text = "<span class='notice'>You feel your encoded audio chip malfunction. You can no longer speak or understand the language of fax machines.</span>"
/datum/quirk/encodedspeaker/add()
var/mob/living/M = quirk_holder
M.grant_language(/datum/language/machine)
/datum/quirk/encodedspeaker/remove()
var/mob/living/M = quirk_holder
M.remove_language(/datum/language/machine)
/datum/quirk/xenospeaker
name = "Xenocommon speaker"
desc = "Through time observing and interacting with xenos and xeno hybrids, you've learned the intricate hissing patterns of their language."
value = 1
gain_text = "<span class='notice'>You feel that you are now able to hiss in the same way xenomorphs do.</span>"
lose_text = "<span class='notice'>You seem to no longer know how to speak xenocommon.</span>"
/datum/quirk/xenospeaker/add()
var/mob/living/M = quirk_holder
M.grant_language(/datum/language/xenocommon)
/datum/quirk/xenospeaker/remove()
var/mob/living/M = quirk_holder
M.remove_language(/datum/language/xenocommon)
hyperstation/code/datums/traits/neutral.dm
+18
View File
@@ -0,0 +1,18 @@
//Skyrat port start
/datum/quirk/alcohol_lightweight
name = "Alcoholic Lightweight"
desc = "Alcohol really goes straight to your head, gotta be careful with what you drink."
value = 0
mob_trait = TRAIT_ALCOHOL_LIGHTWEIGHT
gain_text = "<span class='notice'>You feel woozy thinking of alcohol.</span>"
lose_text = "<span class='notice'>You regain your stomach for drinks.</span>"
//Skyrat port stop
/datum/quirk/cursed_blood
name = "Cursed Blood"
desc = "Your lineage is cursed with the paleblood curse. Best to stay away from holy water... Hell water, on the other hand..."
value = 0
mob_trait = TRAIT_CURSED_BLOOD
gain_text = "<span class='notice'>A curse from a land where men return as beasts runs deep in your blood. Best to stay away from holy water... Hell water, on the other hand...</span>"
lose_text = "<span class='notice'>You feel the weight of the curse in your blood finally gone.</span>"
medical_record_text = "Patient suffers from an unknown type of aversion to holy reagents. Keep them away from a chaplain."
hyperstation/code/game/objects/structures/ghost_role_spawners.dm
+105
View File
@@ -0,0 +1,105 @@
//Duo malfunctioning cryostasis sleepers: Spawns in big makeshift shelters in lavaland.
/obj/effect/mob_spawn/human/duohermit
name = "malfunctioning cryostasis sleeper"
desc = "A humming sleeper with a silhouetted occupant inside. Its stasis function is broken and it's likely being used as a bed."
mob_name = "a stranded hermit"
job_description = "Lavaland Hermit"
icon = 'icons/obj/lavaland/spawners.dmi'
icon_state = "cryostasis_sleeper"
roundstart = FALSE
death = FALSE
random = TRUE
mob_species = /datum/species/human
flavour_text = "<span class='big bold'>You and another have been stranded in this planet for quite some time now.</span><b> Each day you barely scrape by, and between the terrible \
conditions of your makeshift shelter, the hostile creatures, and the ash drakes swooping down from the cloudless skies, all you can wish for is the feel of soft grass between your toes and \
the fresh air of Earth. These thoughts are dispelled by yet another recollection of how you and your friend got here... "
assignedrole = "Hermit"
mirrorcanloadappearance = TRUE
/obj/effect/mob_spawn/human/duohermit/Initialize(mapload)
. = ..()
var/arrpee = rand(1,3)
switch(arrpee)
if(1)
flavour_text += "you were an intern at a rather odd deep space facility. You weren't quite sure how things worked or what they were doing there, but it was your first day on the \
job. A day that was abruptly interrupted by gunfire and alarms. Luckily enough, your handy crowbar skills managed to get you to an escape pod before it was too late.</b>"
outfit.uniform = /obj/item/clothing/under/assistantformal
outfit.shoes = /obj/item/clothing/shoes/sneakers/black
outfit.back = /obj/item/storage/backpack
if(2)
flavour_text += "you were a volunteer test subject for a state of the art deep space facility. You didn't care much about who you were working with, but in the end, the paycheck \
was really, really good. To this day, you're not quite sure which sort of prototype implants were used on you, as you seem to remember little but the headache that struck you once \
the escape pod finally hit the ground and your seatbelt failed to keep you buckled.</b>"
outfit.uniform = /obj/item/clothing/under/rank/scientist
outfit.suit = /obj/item/clothing/suit/toggle/labcoat
outfit.shoes = /obj/item/clothing/shoes/sneakers/black
outfit.back = /obj/item/storage/backpack
if(3)
flavour_text += "you were a doctor at a state of the art deep space facility. For who exactly you were conducting research for, not even you are quite sure. Only that the paycheck \
at the end of the month was good enough. In the end, when said facility was attacked by Nanotransen, you and another were the only ones to have made it out alive. Or so it seemed.</b>"
outfit.uniform = /obj/item/clothing/under/rank/medical
outfit.suit = /obj/item/clothing/suit/toggle/labcoat
outfit.back = /obj/item/storage/backpack/medic
outfit.shoes = /obj/item/clothing/shoes/sneakers/black
/obj/effect/mob_spawn/human/duohermit/Destroy()
new/obj/structure/fluff/empty_cryostasis_sleeper(get_turf(src))
return ..()
//Exiles: Stranded exiles that have been left in Snowdin. Can be easily adapted for other roles as well.
/obj/effect/mob_spawn/human/exiled
name = "used bed"
desc = "Still warm."
mob_name = "exiled"
job_description = "Exiles"
icon = 'icons/obj/objects.dmi'
icon_state = "bed"
roundstart = FALSE
death = FALSE
random = TRUE
mob_species = /datum/species/human
flavour_text = "As the last escape shuttle left the sector, you were left for dead, stranded in a cold hell where you make do, until hopefully someone finds you. \
Every day, you pause and recollect your memories from before it all happened... "
assignedrole = "Arctic Exile"
mirrorcanloadappearance = TRUE
ghost_usable = FALSE
/obj/effect/mob_spawn/human/exiled/Initialize(mapload)
. = ..()
delayusability(9000, FALSE) //Probably should not show up on the menu? It gives it away that snowdin is the away mission.
var/arrpee = rand(1,3)
switch(arrpee)
if(1)
flavour_text += "You were a lowly engineer, hired by Kinaris to make sure the turbines from their mining operation remained functional. \
You remember the day the mining team descended for the very last time into the depths of the shafts, only to never return. \
The agonizing screams from whatever now haunts those mines still brings a shiver down your spine."
outfit.uniform = /obj/item/clothing/under/rank/engineer
outfit.suit = /obj/item/clothing/suit/hooded/wintercoat/engineering
outfit.shoes = /obj/item/clothing/shoes/sneakers/black
outfit.back = /obj/item/storage/backpack/industrial
outfit.id = /obj/item/card/id/away/snowdin/eng
outfit.implants = list(/obj/item/implant/exile) //Made it so they cannot simply exit through the gateway at will.
if(2)
flavour_text += "You were a plasma researcher, hired by Kinaris to oversee a small research division in a remote, isolated little icy planet, \
you remember the day the mining team descended for the very last time into the depths of the shafts, only to never return. \
While you haven't heard them yourself, reports say the sounds that were heard over radio were likely not of this world."
outfit.uniform = /obj/item/clothing/under/rank/scientist
outfit.suit = /obj/item/clothing/suit/hooded/wintercoat/science
outfit.shoes = /obj/item/clothing/shoes/sneakers/black
outfit.back = /obj/item/storage/backpack/science
outfit.id = /obj/item/card/id/away/snowdin/sci
outfit.implants = list(/obj/item/implant/exile) //Made it so they cannot simply exit through the gateway at will.
if(3)
flavour_text += "You were a junior doctor, hired by Kinaris to oversee the mental state of a plasma mining operation's miners. \
Over and over you reported that the miners were having constant, similar types of hallucinations and that perhaps the whole operation should pause \
until further investigation was concluded, but command shrugged it off as an episode of mass hallucination... Until the miners never came back."
outfit.uniform = /obj/item/clothing/under/rank/medical
outfit.suit = /obj/item/clothing/suit/hooded/wintercoat/medical
outfit.shoes = /obj/item/clothing/shoes/sneakers/black
outfit.back = /obj/item/storage/backpack/medic
outfit.id = /obj/item/card/id/away/snowdin/med
outfit.implants = list(/obj/item/implant/exile) //Made it so they cannot simply exit through the gateway at will.
/obj/effect/mob_spawn/human/exiled/Destroy()
new/obj/structure/bed(get_turf(src))
return ..()
hyperstation/code/modules/mob/mob_helpers.dm
+27
View File
@@ -0,0 +1,27 @@
mob/proc/checkloadappearance()
var/mob/living/carbon/human/H = src
//This will be where the person gets to select their appearance instead of the random character
if (world.time <= (H.time_initialized + 900) && H.mirrorcanloadappearance == TRUE)
SEND_SOUND(H, 'sound/misc/server-ready.ogg')
to_chat(H, "<span class='boldannounce'>This ghost role allows you to select your loaded character's appearance. Make sure you have your ID in your ID slot, if you have one.</span>")
if(alert(H, "Would you like to load your currently loaded character's appearance?", "This can only be done up until 90s after you spawn.", "Yes", "No") == "Yes" && world.time <= (H.time_initialized + 900))
H.client.prefs.copy_to(H)
if (H.custom_body_size) //Do they have a custom size set?
H.resize(H.custom_body_size * 0.01)
H.real_name = H.client.prefs.real_name
H.mind.name = H.real_name //Makes sure to change their mind name to their real name.
SSquirks.AssignQuirks(H, H.client, TRUE, FALSE, H.job, FALSE)//This Assigns the selected character's quirks
H.dna.update_dna_identity() //This makes sure their DNA is updated.
var/obj/item/card/id/idCard = H.get_idcard() //Time to change their ID card as well if they have one.
if (idCard != null)
idCard.update_label(H.real_name, idCard.assignment)
idCard.registered_name = H.real_name
H.mirrorcanloadappearance = FALSE //Prevents them from using the mirror again.
SEND_SOUND(H, 'sound/magic/charge.ogg') //Fluff
to_chat(H, "<span class='boldannounce'>Your head aches for a second. You feel like this is how things should have been.</span>")
log_game("[key_name(H)] has loaded their default appearance for a ghost role.")
message_admins("[ADMIN_LOOKUPFLW(H)] has loaded their default appearance for a ghost role.")
return
else
to_chat(H, "<span class='boldannounce'>You either took too long or chose not to change. Alrighty. Remember, you have 90 seconds from spawn to get to a mirror and still do it if you wish.</span>")
return
icons/mob/uniform.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 362 KiB

After

Width:  |  Height:  |  Size: 364 KiB

icons/obj/clothing/uniforms.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 104 KiB

After

Width:  |  Height:  |  Size: 104 KiB

modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm
+48 -5
View File
@@ -920,11 +920,6 @@ datum/sprite_accessory/ears/human/gret
name = "Synthetic Lizard - Snout Under"
icon_state = "synthliz_under"
/datum/sprite_accessory/mam_snouts/synthliz/synthliz_over
color_src = MATRIXED
name = "Synthetic Lizard - Snout Tertiary Face Plate"
icon_state = "synthliz_over"
/datum/sprite_accessory/mam_snouts/synthliz/synthliz_tert
color_src = MATRIXED
name = "Synthetic Lizard - Snout Tertiary"
@@ -935,7 +930,55 @@ datum/sprite_accessory/ears/human/gret
name = "Synthetic Lizard - Snout Tertiary Under"
icon_state = "synthliz_tertunder"
/datum/sprite_accessory/mam_snouts/synthliz/synthlizalt_basic
color_src = MUTCOLORS
name = "Synthetic Lizard Alt - Snout"
icon_state = "synthlizalt_basic"
/datum/sprite_accessory/mam_snouts/synthliz/synthlizalt_under
color_src = MATRIXED
name = "Synthetic Lizard Alt - Snout Under"
icon_state = "synthlizalt_under"
/datum/sprite_accessory/mam_snouts/synthliz/synthlizalt_over
color_src = MATRIXED
name = "Synthetic Lizard Alt - Snout Over"
icon_state = "synthlizalt_over"
/datum/sprite_accessory/mam_snouts/synthliz/synthlizalt_tert
color_src = MATRIXED
name = "Synthetic Lizard Alt - Snout Tertiary"
icon_state = "synthlizalt_tert"
/datum/sprite_accessory/mam_snouts/synthliz/synthlizalt_tertunder
color_src = MATRIXED
name = "Synthetic Lizard Alt - Snout Tertiary Under"
icon_state = "synthlizalt_tertunder"
/datum/sprite_accessory/mam_snouts/synthliz/synthlizbarlessalt_basic
color_src = MUTCOLORS
name = "Synthetic Lizard Barless Alt - Snout"
icon_state = "synthlizbarlessalt_basic"
/datum/sprite_accessory/mam_snouts/synthliz/synthlizbarlessalt_under
color_src = MATRIXED
name = "Synthetic Lizard Barless Alt - Snout Under"
icon_state = "synthlizbarlessalt_under"
/datum/sprite_accessory/mam_snouts/synthliz/synthlizbarlessalt_over
color_src = MATRIXED
name = "Synthetic Lizard Barless Alt - Snout Over"
icon_state = "synthlizbarlessalt_over"
/datum/sprite_accessory/mam_snouts/synthliz/synthlizbarlessalt_tert
color_src = MATRIXED
name = "Synthetic Lizard Barless Alt - Snout Tertiary"
icon_state = "synthlizbarlessalt_tert"
/datum/sprite_accessory/mam_snouts/synthliz/synthlizbarlessalt_tertunder
color_src = MATRIXED
name = "Synthetic Lizard Barless Alt - Snout Tertiary Under"
icon_state = "synthlizbarlessalt_tertunder"
/******************************************
**************** Snouts *******************
modular_citadel/icons/mob/ipc_antennas.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

modular_citadel/icons/mob/mam_snouts.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 19 KiB

tgstation.dme
+6 -1
View File
@@ -2941,6 +2941,10 @@
#include "code\modules\zombie\items.dm"
#include "code\modules\zombie\organs.dm"
#include "hyperstation\code\datums\elements\holder_micro.dm"
#include "hyperstation\code\datums\ruins\lavaland.dm"
#include "hyperstation\code\datums\traits\good.dm"
#include "hyperstation\code\datums\traits\neutral.dm"
#include "hyperstation\code\game\objects\structures\ghost_role_spawners.dm"
#include "hyperstation\code\gamemode\traitor_lewd.dm"
#include "hyperstation\code\gamemode\traitor_thief.dm"
#include "hyperstation\code\gamemode\werewolf\werewolf.dm"
@@ -2948,16 +2952,17 @@
#include "hyperstation\code\mobs\hugbot.dm"
#include "hyperstation\code\mobs\mimic.dm"
#include "hyperstation\code\mobs\werewolf.dm"
#include "hyperstation\code\modules\traits.dm"
#include "hyperstation\code\modules\antagonists\werewolf\werewolf.dm"
#include "hyperstation\code\modules\clothing\head.dm"
#include "hyperstation\code\modules\crafting\bounties.dm"
#include "hyperstation\code\modules\crafting\recipes.dm"
#include "hyperstation\code\modules\integrated_electronics\input.dm"
#include "hyperstation\code\modules\mob\mob_helpers.dm"
#include "hyperstation\code\modules\patreon\patreon.dm"
#include "hyperstation\code\modules\resize\resizing.dm"
#include "hyperstation\code\modules\resize\sizechems.dm"
#include "hyperstation\code\modules\resize\sizegun.dm"
#include "hyperstation\code\modules\traits.dm"
#include "hyperstation\code\obj\bluespace sewing kit.dm"
#include "hyperstation\code\obj\condom.dm"
#include "hyperstation\code\obj\decal.dm"