linter woes, + disables hangover for now
This commit is contained in:
@@ -52,7 +52,7 @@ PROCESSING_SUBSYSTEM_DEF(station)
|
||||
setup_trait(trait_typepath)
|
||||
continue
|
||||
|
||||
if(initial(trait_typepath.trait_flags) & STATION_TRAIT_ABSTRACT)
|
||||
if(initial(trait_typepath.trait_flags) & STATION_TRAIT_ABSTRACT || initial(trait_typepath.weight) == 0)
|
||||
continue //Dont add abstract ones to it
|
||||
selectable_traits_by_types[initial(trait_typepath.trait_type)][trait_typepath] = initial(trait_typepath.weight)
|
||||
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
/datum/station_trait/hangover
|
||||
name = "Hangover"
|
||||
trait_type = STATION_TRAIT_NEGATIVE
|
||||
weight = 2
|
||||
weight = 0
|
||||
show_in_report = TRUE
|
||||
report_message = "Ohh....Man....That mandatory office party from last shift...God that was awesome..I woke up in some random toilet 3 sectors away..."
|
||||
trait_to_give = STATION_TRAIT_HANGOVER
|
||||
|
||||
@@ -115,7 +115,7 @@
|
||||
SIGNAL_HANDLER
|
||||
var/scarf_type = pick(scarves)
|
||||
|
||||
spawned.equip_to_slot_or_del(new scarf_type(spawned), ITEM_SLOT_NECK, initial = FALSE)
|
||||
spawned.equip_to_slot_or_del(new scarf_type(spawned), ITEM_SLOT_NECK)
|
||||
|
||||
|
||||
/datum/station_trait/filled_maint
|
||||
|
||||
@@ -22,8 +22,11 @@
|
||||
CRASH("dynamic preview is unsupported")
|
||||
return H.Robotize(FALSE, latejoin)
|
||||
|
||||
/datum/job/cyborg/after_spawn(mob/living/silicon/robot/R, mob/M)
|
||||
R.updatename(M.client)
|
||||
/datum/job/cyborg/after_spawn(mob/living/silicon/robot/R, client/player_client)
|
||||
. = ..()
|
||||
if(!istype(R))
|
||||
return
|
||||
R.updatename(player_client)
|
||||
R.gender = NEUTER
|
||||
|
||||
/datum/job/cyborg/radio_help_message(mob/M)
|
||||
|
||||
@@ -7,13 +7,18 @@
|
||||
total_positions = 0
|
||||
spawn_positions = 0
|
||||
supervisors = "the security team"
|
||||
random_spawns_possible = FALSE
|
||||
|
||||
outfit = /datum/outfit/job/prisoner
|
||||
plasma_outfit = /datum/outfit/plasmaman/prisoner
|
||||
|
||||
display_order = JOB_DISPLAY_ORDER_PRISONER
|
||||
|
||||
/datum/job/prisoner/get_latejoin_spawn_point()
|
||||
return get_roundstart_spawn_point()
|
||||
|
||||
/datum/job/prisoner/after_spawn(mob/living/carbon/human/H, mob/M)
|
||||
. = ..()
|
||||
var/list/policies = CONFIG_GET(keyed_list/policy)
|
||||
var/policy = policies[POLICYCONFIG_JOB_PRISONER]
|
||||
if(policy)
|
||||
|
||||
@@ -303,12 +303,15 @@
|
||||
item_to_add.forceMove(drop_location())
|
||||
if(prob(25))
|
||||
step_rand(item_to_add)
|
||||
for(var/i in list(1,2,4,8,4,8,4,dir))
|
||||
setDir(i)
|
||||
sleep(1)
|
||||
spawn(0)
|
||||
for(var/i in list(1,2,4,8,4,8,4,dir))
|
||||
setDir(i)
|
||||
sleep(1)
|
||||
|
||||
return valid
|
||||
|
||||
|
||||
|
||||
/mob/living/simple_animal/pet/dog/corgi/proc/update_corgi_fluff()
|
||||
// First, change back to defaults
|
||||
name = real_name
|
||||
|
||||
Reference in New Issue
Block a user