cyberpresidentvanellope/fulpstation
1
0
Fork 0
mirror of https://github.com/fulpstation/fulpstation.git synced 2025-12-10 10:01:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

begone, badcode!

Browse Source
This commit is contained in:
tralezab
2019-05-27 08:48:03 -07:00
parent 03e85dd44a
commit c33c7fff9d
3 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/game/objects/structures/fugitive_role_spawners.dm
View File

@@ -8,6 +8,7 @@
random = TRUE random = TRUE
show_flavour = FALSE show_flavour = FALSE
density = TRUE density = TRUE
var/back_story = "error"
/obj/effect/mob_spawn/human/fugitive/Initialize(mapload) /obj/effect/mob_spawn/human/fugitive/Initialize(mapload)
. = ..() . = ..()
@@ -15,8 +16,8 @@
/obj/effect/mob_spawn/human/fugitive/special(mob/living/new_spawn) /obj/effect/mob_spawn/human/fugitive/special(mob/living/new_spawn)
var/datum/antagonist/fugitive_hunter/fughunter = new_spawn.mind.add_antag_datum(/datum/antagonist/fugitive_hunter) var/datum/antagonist/fugitive_hunter/fughunter = new_spawn.mind.add_antag_datum(/datum/antagonist/fugitive_hunter)
fughunter.backstory = flavour_text fughunter.backstory = back_story
fughunter.greet(flavour_text) fughunter.greet()
message_admins("[ADMIN_LOOKUPFLW(new_spawn)] has been made into a Fugitive Hunter by an event.") message_admins("[ADMIN_LOOKUPFLW(new_spawn)] has been made into a Fugitive Hunter by an event.")
log_game("[key_name(new_spawn)] was spawned as a Fugitive Hunter by an event.") log_game("[key_name(new_spawn)] was spawned as a Fugitive Hunter by an event.")
@@ -24,14 +25,16 @@
name = "police pod" name = "police pod"
desc = "A small sleeper typically used to put people to sleep for briefing on the mission." desc = "A small sleeper typically used to put people to sleep for briefing on the mission."
mob_name = "a spacepol officer" mob_name = "a spacepol officer"
flavour_text = "space cop" flavour_text = "Justice has arrived. I am a member of the Spacepol!"
back_story = "space cop"
outfit = /datum/outfit/spacepol outfit = /datum/outfit/spacepol
icon = 'icons/obj/machines/sleeper.dmi' icon = 'icons/obj/machines/sleeper.dmi'
icon_state = "sleeper" icon_state = "sleeper"
/obj/effect/mob_spawn/human/fugitive/russian /obj/effect/mob_spawn/human/fugitive/russian
name = "russian pod" name = "russian pod"
flavour_text = "russian" flavour_text = "Ay blyat. I am a space-russian smuggler! We were mid-flight when our cargo was beamed off our ship!"
back_story = "russian"
desc = "A small sleeper typically used to make long distance travel a bit more bearable." desc = "A small sleeper typically used to make long distance travel a bit more bearable."
mob_name = "russian" mob_name = "russian"
outfit = /datum/outfit/russiancorpse outfit = /datum/outfit/russiancorpse

4
code/modules/antagonists/fugitive/hunter.dm
View File

@@ -2,7 +2,7 @@
/datum/antagonist/fugitive_hunter /datum/antagonist/fugitive_hunter
name = "Fugitive Hunter" name = "Fugitive Hunter"
roundend_category = "Fugitive" roundend_category = "Fugitive"
silent = TRUE //greet called by the event as well silent = TRUE //greet called by the spawn
var/datum/team/fugitive_hunters/hunter_team var/datum/team/fugitive_hunters/hunter_team
var/backstory = "error" var/backstory = "error"
@@ -24,7 +24,7 @@
capture.explanation_text = "Capture the fugitives in the station and put them into the bluespace capture machine on your ship." capture.explanation_text = "Capture the fugitives in the station and put them into the bluespace capture machine on your ship."
objectives += capture objectives += capture
/datum/antagonist/fugitive_hunter/greet(backstory) /datum/antagonist/fugitive_hunter/greet()
switch(backstory) switch(backstory)
if("space cop") if("space cop")
to_chat(owner, "<span class='boldannounce'>Justice has arrived. I am a member of the Spacepol!</span>") to_chat(owner, "<span class='boldannounce'>Justice has arrived. I am a member of the Spacepol!</span>")

9
code/modules/events/fugitive_spawning.dm
View File

@@ -14,7 +14,7 @@
/datum/round_event/ghost_role/fugitives/spawn_role() /datum/round_event/ghost_role/fugitives/spawn_role()
var/list/possible_spawns = list()//Some xeno spawns are in some spots that will instantly kill the refugees, like atmos var/list/possible_spawns = list()//Some xeno spawns are in some spots that will instantly kill the refugees, like atmos
for(var/turf/X in GLOB.xeno_spawn) for(var/turf/X in GLOB.xeno_spawn)
if(istype(X, /area/maintenance)) if(istype(X.loc, /area/maintenance))
possible_spawns += X possible_spawns += X
if(!possible_spawns.len) if(!possible_spawns.len)
message_admins("No valid spawn locations found, aborting...") message_admins("No valid spawn locations found, aborting...")
@@ -117,10 +117,3 @@
if(!ship.load(T)) if(!ship.load(T))
CRASH("Loading hunter ship failed!") CRASH("Loading hunter ship failed!")
priority_announce("Unidentified armed ship detected near the station.") priority_announce("Unidentified armed ship detected near the station.")
for(var/turf/A in ship.get_affected_turfs(T))
for(var/obj/structure/chair/chair in A) //every chair gets a spawner on it.
switch(backstory)
if("space cop")
new /obj/effect/mob_spawn/human/fugitive/spacepol(get_turf(chair))
if("russian")
new /obj/effect/mob_spawn/human/fugitive/russian(get_turf(chair))