cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-10 17:52:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Gives Fugitive Hunters credible IDs, access restricts the hunter shuttles, minor hunter shuttle improvements (#75913)

Browse Source 
## About The Pull Request

This standardizes fugitive hunter IDs, making all hunter packs use the
same subtype and giving them to hunters who would spawn with no ID at
all.

The badass flaming ID color that the OG Bounty Hunter team got are now
the standard for fugitive hunter IDs. Additionally, these IDs now come
with a radical skull trim.

(Spacepol Officers don't get the badass flaming skull ID, and instead
get a more modest Police Officer ID).

**These IDs come with access, too. Airlocks, bolt buttons, shuttle
controls, and shutters on all of the hunter shuttles now require a
hunter's ID to operate.**

While I was in the area doing mapping stuff to get the accesses in
place, I made a few other very minor changes to the shuttles. These
include:

- The Bounty Hunter shuttle now has an oxygen dispenser. Two walls have
been moved to make space.
- The Russian Hunter shuttle now gets enough oxygen tanks to share with
everyone.
- The Psyker Hunter spawners now have proper spawner menu text. This was
due to duplicate-but-not-really subtypes existing, and me mistakenly
putting the wrong ones there in a previous PR.
- The cut ai wire helpers from the Russian/Psyker shuttles have been
extended to the Bounty/Spacepol shuttles.
- Every hunter shuttle now has a shuttle pinpointer on it somewhere, and
is no longer exclusive to a single Bounty Hunter's loadout.
## Why It's Good For The Game

Some of the hunter IDs would spawn without trims or coloration, and some
hunters wouldn't spawn with IDs at all. Now, everyone gets a credible,
cool-looking ID that lets everyone know what you're here to do at a
glance.

One of these is a crazed larper with an unregistered firearm, the other
is a certified bounty hunter.

As for the hunter access, it's pretty nonsensical that anyone can just
walk into the hunter ship and set up shop. At least the pirates get
turrets! Not to mention, it's hard to balance or give hunters new
equipment in good conscience when their entire domain is public-access
and anything they can't carry is considered forfeit to the crew. Now it
can be used as a base of operations, storage area, etc. more securely.

Locking down the shuttle with accesses isn't going to stop a determined
gamer with a toolset, but it'll at least make it more interesting and an
actual risk. If the fugitives want to try and loot/hijack the shuttle,
it will require the effort of taking down one of their hunters first.

While hunters stand out for the differences/imbalances between each
group, I don't see the shuttle pinpointer as something that contributes
positively to the OG bounty hunter's uniqueness. There's no reason why
the other hunters shouldn't also be able to track their ship.
This commit is contained in:
Rhials
2023-06-15 23:27:19 -04:00
committed by GitHub
parent 450ac17779
commit abc0820466
11 changed files with 127 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
_maps/shuttles/hunter_bounty.dmm
View File

@@ -6,8 +6,12 @@
/turf/closed/wall/mineral/plastitanium,
/area/shuttle/hunter)
"c" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/obj/machinery/door/airlock/external/ruin,
/obj/effect/mapping_helpers/airlock/access/all/hunter,
/obj/effect/mapping_helpers/airlock/cutaiwire,
/turf/open/floor/plating,
/area/shuttle/hunter)
"d" = (
@@ -26,6 +30,8 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/machinery/door/airlock/external/ruin,
/obj/structure/fans/tiny,
/obj/effect/mapping_helpers/airlock/access/all/hunter,
/obj/effect/mapping_helpers/airlock/cutaiwire,
/turf/open/floor/plating,
/area/shuttle/hunter)
"g" = (
@@ -33,7 +39,8 @@
/turf/closed/wall/mineral/plastitanium,
/area/shuttle/hunter)
"h" = (
/turf/open/floor/plating,
/obj/structure/tank_dispenser/oxygen,
/turf/open/floor/pod/dark,
/area/shuttle/hunter)
"i" = (
/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
@@ -48,11 +55,9 @@
/turf/closed/wall/mineral/plastitanium,
/area/shuttle/hunter)
"l" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/obj/machinery/door/airlock/external/ruin,
/turf/open/floor/plating,
/obj/structure/table,
/obj/item/multitool,
/turf/open/floor/pod/dark,
/area/shuttle/hunter)
"m" = (
/obj/structure/chair/office{
@@ -113,6 +118,9 @@
/area/shuttle/hunter)
"x" = (
/obj/structure/table,
/obj/item/pinpointer/shuttle{
pixel_y = 4
},
/turf/open/floor/pod/dark,
/area/shuttle/hunter)
"y" = (
@@ -138,7 +146,7 @@
/turf/open/floor/pod/dark,
/area/shuttle/hunter)
"C" = (
/obj/item/multitool,
/obj/machinery/fugitive_capture,
/turf/open/floor/pod/dark,
/area/shuttle/hunter)
"D" = (
@@ -157,8 +165,11 @@
/turf/open/floor/pod/dark,
/area/shuttle/hunter)
"G" = (
/obj/machinery/fugitive_capture,
/turf/open/floor/pod/dark,
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/machinery/door/airlock/external/ruin,
/obj/effect/mapping_helpers/airlock/access/all/hunter,
/obj/effect/mapping_helpers/airlock/cutaiwire,
/turf/open/floor/plating,
/area/shuttle/hunter)
"H" = (
/obj/effect/turf_decal/stripes/line{
@@ -191,17 +202,19 @@
/obj/docking_port/stationary{
dwidth = 11;
height = 16;
shuttle_id = "pirate_home";
name = "Deep Space";
shuttle_id = "pirate_home";
width = 17
},
/obj/docking_port/mobile{
shuttle_id = "huntership";
movement_force = list("KNOCKDOWN" = 0, "THROW" = 0);
name = "hunter shuttle";
rechargeTime = 1800
rechargeTime = 1800;
shuttle_id = "huntership"
},
/obj/structure/fans/tiny,
/obj/effect/mapping_helpers/airlock/access/all/hunter,
/obj/effect/mapping_helpers/airlock/cutaiwire,
/turf/open/floor/plating,
/area/shuttle/hunter)
"M" = (
@@ -301,11 +314,11 @@ b
b
g
b
b
h
s
s
s
C
G
b
b
g
b
@@ -314,15 +327,15 @@ b
(7,1,1) = {"
f
d
h
j
l
c
s
t
D
H
c
s
G
d
h
j
L
"}
@@ -363,7 +376,7 @@ i
k
n
w
x
l
s
K
b

30
_maps/shuttles/hunter_psyker.dmm
View File

@@ -56,7 +56,7 @@
},
/area/shuttle/hunter)
"dq" = (
/obj/effect/mob_spawn/ghost_role/human/fugitive/bounty/psyker/seer{
/obj/effect/mob_spawn/ghost_role/human/fugitive/psyker/seer{
dir = 8
},
/turf/open/floor/engine,
@@ -280,6 +280,7 @@
},
/obj/effect/mapping_helpers/airlock/cutaiwire,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/obj/effect/mapping_helpers/airlock/access/all/hunter,
/turf/open/floor/plating,
/area/shuttle/hunter)
"oL" = (
@@ -326,6 +327,7 @@
name = "Sanctuary In The Garden Of Mind"
},
/obj/effect/mapping_helpers/airlock/cutaiwire,
/obj/effect/mapping_helpers/airlock/access/all/hunter,
/turf/open/floor/plating,
/area/shuttle/hunter)
"rF" = (
@@ -340,7 +342,6 @@
/obj/machinery/door/airlock/grunge{
name = "Fortune Telling"
},
/obj/effect/mapping_helpers/airlock/cutaiwire,
/turf/open/floor/carpet/black,
/area/shuttle/hunter)
"sB" = (
@@ -395,6 +396,7 @@
name = "Bridge"
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/obj/effect/mapping_helpers/airlock/access/all/hunter,
/turf/open/floor/iron,
/area/shuttle/hunter)
"vw" = (
@@ -465,6 +467,7 @@
name = "Maintenance"
},
/obj/effect/mapping_helpers/airlock/cutaiwire,
/obj/effect/mapping_helpers/airlock/access/all/hunter,
/turf/open/floor/plating,
/area/shuttle/hunter)
"yd" = (
@@ -590,6 +593,7 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/obj/effect/mapping_helpers/airlock/access/all/hunter,
/turf/open/floor/plating,
/area/shuttle/hunter)
"Dw" = (
@@ -608,6 +612,7 @@
},
/obj/effect/mapping_helpers/airlock/cutaiwire,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/obj/effect/mapping_helpers/airlock/access/all/hunter,
/turf/open/floor/iron/grimy,
/area/shuttle/hunter)
"En" = (
@@ -621,6 +626,7 @@
name = "Gear Storage"
},
/obj/effect/mapping_helpers/airlock/cutaiwire,
/obj/effect/mapping_helpers/airlock/access/all/hunter,
/turf/open/floor/iron/grimy,
/area/shuttle/hunter)
"Gv" = (
@@ -713,6 +719,7 @@
},
/obj/effect/mapping_helpers/airlock/cutaiwire,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/obj/effect/mapping_helpers/airlock/access/all/hunter,
/turf/open/floor/iron/freezer,
/area/shuttle/hunter)
"Kp" = (
@@ -782,7 +789,7 @@
/turf/open/floor/iron/dark/textured,
/area/shuttle/hunter)
"NO" = (
/obj/effect/mob_spawn/ghost_role/human/fugitive/psykers,
/obj/effect/mob_spawn/ghost_role/human/fugitive/psyker,
/obj/machinery/light/floor,
/obj/structure/curtain/bounty,
/turf/open/floor/engine,
@@ -813,8 +820,10 @@
/obj/machinery/button/curtain{
id = "fortune_tell";
name = "Fortune Telling Curtains";
pixel_x = -24
pixel_x = -24;
req_access = list("hunter")
},
/obj/effect/mapping_helpers/airlock/access/all/hunter,
/turf/open/floor/carpet/black,
/area/shuttle/hunter)
"Ph" = (
@@ -823,6 +832,7 @@
name = "Maintenance"
},
/obj/effect/mapping_helpers/airlock/cutaiwire,
/obj/effect/mapping_helpers/airlock/access/all/hunter,
/turf/open/floor/plating,
/area/shuttle/hunter)
"Pv" = (
@@ -940,6 +950,7 @@
id = "psykerexternal";
name = "External Bolt Control";
normaldoorcontrol = 1;
req_access = list("hunter");
specialfunctions = 4
},
/obj/effect/decal/cleanable/generic,
@@ -978,7 +989,7 @@
/turf/open/floor/catwalk_floor,
/area/shuttle/hunter)
"Wy" = (
/obj/effect/mob_spawn/ghost_role/human/fugitive/psykers/captain,
/obj/effect/mob_spawn/ghost_role/human/fugitive/psyker/captain,
/obj/machinery/light/floor,
/obj/structure/curtain/bounty,
/turf/open/floor/engine,
@@ -1001,7 +1012,8 @@
"Xa" = (
/obj/machinery/button/door/directional/west{
id = "psyker_bridge";
name = "Blast Door Control"
name = "Blast Door Control";
req_access = list("hunter")
},
/turf/open/floor/iron/kitchen/small,
/area/shuttle/hunter)
@@ -1032,6 +1044,8 @@
/obj/machinery/door/airlock/grunge{
name = "Office"
},
/obj/effect/mapping_helpers/airlock/access/all/hunter,
/obj/effect/mapping_helpers/airlock/cutaiwire,
/turf/open/floor/iron/grimy,
/area/shuttle/hunter)
"Zb" = (
@@ -1043,6 +1057,7 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/obj/effect/mapping_helpers/airlock/access/all/hunter,
/turf/open/floor/plating,
/area/shuttle/hunter)
"ZC" = (
@@ -1060,6 +1075,9 @@
pixel_y = 3
},
/obj/item/megaphone,
/obj/item/pinpointer/shuttle{
pixel_y = 7
},
/obj/item/clothing/glasses/thermal/monocle{
pixel_y = 2
},

27
_maps/shuttles/hunter_russian.dmm
View File

@@ -132,6 +132,7 @@
dir = 1
},
/obj/effect/mapping_helpers/airlock/locked,
/obj/effect/mapping_helpers/airlock/access/all/hunter,
/turf/open/floor/pod/light,
/area/shuttle/hunter/russian)
"ho" = (
@@ -148,10 +149,12 @@
/obj/effect/decal/cleanable/dirt,
/obj/structure/rack,
/obj/item/binoculars,
/obj/item/pinpointer/shuttle,
/obj/machinery/button/door/directional/south{
id = "russia_ship_bolt_s";
name = "External Bolt Control";
normaldoorcontrol = 1;
req_access = list("hunter");
specialfunctions = 4
},
/turf/open/floor/mineral/plastitanium,
@@ -165,6 +168,7 @@
dir = 4
},
/obj/effect/mapping_helpers/airlock/cutaiwire,
/obj/effect/mapping_helpers/airlock/access/all/hunter,
/turf/open/floor/pod/light,
/area/shuttle/hunter/russian)
"kL" = (
@@ -207,6 +211,7 @@
/obj/effect/mapping_helpers/airlock/cutaiwire,
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/effect/mapping_helpers/airlock/locked,
/obj/effect/mapping_helpers/airlock/access/all/hunter,
/turf/open/floor/pod/light,
/area/shuttle/hunter/russian)
"qF" = (
@@ -238,6 +243,7 @@
/obj/machinery/door/airlock/security/glass{
name = "Cockpit Access"
},
/obj/effect/mapping_helpers/airlock/access/all/hunter,
/turf/open/floor/pod/light,
/area/shuttle/hunter/russian)
"vZ" = (
@@ -276,6 +282,7 @@
dir = 4
},
/obj/effect/mapping_helpers/airlock/cutaiwire,
/obj/effect/mapping_helpers/airlock/access/all/hunter,
/turf/open/floor/pod/light,
/area/shuttle/hunter/russian)
"yo" = (
@@ -312,6 +319,7 @@
id = "russia_ship_bolt_n";
name = "External Bolt Control";
normaldoorcontrol = 1;
req_access = list("hunter");
specialfunctions = 4
},
/turf/open/floor/mineral/plastitanium,
@@ -411,10 +419,14 @@
"FG" = (
/obj/effect/turf_decal/bot,
/obj/structure/closet/crate,
/obj/item/tank/internals/emergency_oxygen/engi,
/obj/item/tank/internals/emergency_oxygen/engi,
/obj/effect/decal/cleanable/dirt,
/obj/item/tank/internals/emergency_oxygen/engi,
/obj/item/tank/internals/emergency_oxygen/engi,
/obj/item/tank/internals/emergency_oxygen/engi,
/obj/item/tank/internals/emergency_oxygen/engi,
/obj/item/tank/internals/emergency_oxygen/engi,
/obj/item/clothing/mask/breath,
/obj/item/clothing/mask/breath,
/obj/item/clothing/mask/breath,
/obj/item/clothing/mask/breath,
/obj/item/clothing/mask/breath,
@@ -484,16 +496,16 @@
/area/shuttle/hunter/russian)
"JS" = (
/obj/docking_port/mobile{
shuttle_id = "huntership";
movement_force = list("KNOCKDOWN"=0,"THROW"=0);
name = "hunter shuttle";
rechargeTime = 1800
rechargeTime = 1800;
shuttle_id = "huntership"
},
/obj/docking_port/stationary{
dwidth = 11;
height = 16;
shuttle_id = "pirate_home";
name = "Deep Space";
shuttle_id = "pirate_home";
width = 17
},
/obj/machinery/door/airlock/external/glass/ruin{
@@ -504,6 +516,7 @@
dir = 1
},
/obj/effect/mapping_helpers/airlock/locked,
/obj/effect/mapping_helpers/airlock/access/all/hunter,
/turf/open/floor/plating,
/area/shuttle/hunter/russian)
"JU" = (
@@ -569,6 +582,7 @@
/obj/machinery/door/airlock/security/glass{
name = "Cargo Hold Access"
},
/obj/effect/mapping_helpers/airlock/access/all/hunter,
/turf/open/floor/pod/light,
/area/shuttle/hunter/russian)
"QG" = (
@@ -578,6 +592,7 @@
/obj/effect/mapping_helpers/airlock/cutaiwire,
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/effect/mapping_helpers/airlock/locked,
/obj/effect/mapping_helpers/airlock/access/all/hunter,
/turf/open/floor/plating,
/area/shuttle/hunter/russian)
"Se" = (
@@ -614,6 +629,7 @@
dir = 4
},
/obj/effect/mapping_helpers/airlock/cutaiwire,
/obj/effect/mapping_helpers/airlock/access/all/hunter,
/turf/open/floor/pod/light,
/area/shuttle/hunter/russian)
"Uu" = (
@@ -681,6 +697,7 @@
dir = 4
},
/obj/effect/mapping_helpers/airlock/cutaiwire,
/obj/effect/mapping_helpers/airlock/access/all/hunter,
/turf/open/floor/pod/light,
/area/shuttle/hunter/russian)
"Xu" = (

22
_maps/shuttles/hunter_space_cop.dmm
View File

@@ -19,15 +19,15 @@
dir = 4;
dwidth = 3;
height = 12;
shuttle_id = "huntership_home";
name = "Deep Space";
shuttle_id = "huntership_home";
width = 7
},
/obj/docking_port/mobile{
dir = 4;
shuttle_id = "huntership";
name = "hunter shuttle";
rechargeTime = 1800
rechargeTime = 1800;
shuttle_id = "huntership"
},
/obj/machinery/door/poddoor/shutters{
id = "Interpolship"
@@ -39,7 +39,8 @@
dir = 8
},
/obj/machinery/button/door/directional/north{
id = "Interpolship"
id = "Interpolship";
req_access = list("hunter")
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/hunter)
@@ -65,9 +66,6 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/hunter)
"ak" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/obj/effect/mob_spawn/ghost_role/human/fugitive/spacepol{
dir = 1
},
@@ -87,6 +85,12 @@
/obj/structure/chair/comfy/shuttle,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/hunter)
"eE" = (
/obj/structure/closet/crate/eva,
/obj/effect/turf_decal/box,
/obj/item/pinpointer/shuttle,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/hunter)
"hB" = (
/obj/machinery/power/shuttle_engine/propulsion{
dir = 8
@@ -102,6 +106,8 @@
/area/shuttle/hunter)
"rR" = (
/obj/machinery/door/airlock/titanium,
/obj/effect/mapping_helpers/airlock/access/all/hunter,
/obj/effect/mapping_helpers/airlock/cutaiwire,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/hunter)
"te" = (
@@ -203,7 +209,7 @@ Pq
ku
lp
RO
aj
eE
ku
Pq
"}

2
code/__DEFINES/access.dm
View File

@@ -188,6 +188,8 @@
/// BLOODCULT
//Special, for anything that's basically internal
#define ACCESS_BLOODCULT "bloodcult"
/// HUNTERS
#define ACCESS_HUNTER "hunter"
/// - - - END ACCESS IDS - - -

3
code/datums/id_trim/outfits.dm
View File

@@ -50,5 +50,8 @@
/// Trim for Bounty Hunters NOT hired by centcom. (?)
/datum/id_trim/bounty_hunter
assignment = "Bounty Hunter"
trim_state = "trim_deathcommando"
department_color = COLOR_PRISONER_ORANGE
subdepartment_color = COLOR_PRISONER_BLACK
access = list(ACCESS_HUNTER)

1
code/modules/antagonists/fugitive/hunters/hunter_gear.dm
View File

@@ -37,6 +37,7 @@
name = "shuttle console"
shuttleId = "huntership"
possible_destinations = "huntership_home;huntership_custom;whiteship_home;syndicate_nw"
req_access = list(ACCESS_HUNTER)
/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/hunter
name = "shuttle navigation computer"

17
code/modules/antagonists/fugitive/hunters/hunter_outfits.dm
View File

@@ -11,20 +11,28 @@
ears = /obj/item/radio/headset
l_pocket = /obj/item/ammo_box/magazine/m45
r_pocket = /obj/item/restraints/handcuffs
id = /obj/item/card/id/advanced
id = /obj/item/card/id/advanced/bountyhunter
id_trim = /datum/id_trim/bounty_hunter/police
/datum/outfit/spacepol/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(visualsOnly)
return
var/obj/item/card/id/W = H.wear_id
W.assignment = "Police Officer"
W.registered_name = H.real_name
W.icon_state = "card_black" //Less flamey, more modest, still unique enough to convey that they're fugitive hunters.
W.update_label()
W.update_icon()
/datum/id_trim/bounty_hunter/police
assignment = "Police Officer"
trim_state = "trim_warden"
department_color = COLOR_STRONG_BLUE
access = list(ACCESS_HUNTER)
/datum/outfit/russian_hunter
name = "Russian Hunter"
id = /obj/item/card/id/advanced
uniform = /obj/item/clothing/under/costume/soviet
suit = /obj/item/clothing/suit/armor/bulletproof
suit_store = /obj/item/gun/ballistic/rifle/boltaction
@@ -36,6 +44,7 @@
shoes = /obj/item/clothing/shoes/russian
l_pocket = /obj/item/ammo_box/a762
r_pocket = /obj/item/restraints/handcuffs/cable/zipties
id = /obj/item/card/id/advanced/bountyhunter
/datum/outfit/russian_hunter/pre_equip(mob/living/carbon/human/equip_to)
@@ -153,7 +162,6 @@
ears = /obj/item/radio/headset
id = /obj/item/card/id/advanced/bountyhunter
r_hand = /obj/item/storage/medkit/regular
l_hand = /obj/item/pinpointer/shuttle
backpack_contents = list(
/obj/item/bountytrap = 4
@@ -204,6 +212,7 @@
shoes = /obj/item/clothing/shoes/sandal
l_pocket = /obj/item/restraints/handcuffs/cable/zipties
r_pocket = /obj/item/restraints/handcuffs/cable/zipties
id = /obj/item/card/id/advanced/bountyhunter
id_trim = /datum/id_trim/bounty_hunter/psykers/seer

9
code/modules/mapping/access_helpers.dm
View File

@@ -851,6 +851,15 @@
access_list += ACCESS_SYNDICATE_LEADER
return access_list
// -------------------- Bounty hunter access helpers
/obj/effect/mapping_helpers/airlock/access/all/hunter
icon_state = "access_helper_hunt"
/obj/effect/mapping_helpers/airlock/access/all/hunter/get_access()
var/list/access_list = ..()
access_list += ACCESS_HUNTER
return access_list
// -------------------- Away access helpers
/obj/effect/mapping_helpers/airlock/access/any/away
icon_state = "access_helper_awy"

22
code/modules/mob_spawn/ghost_roles/fugitive_hunter_roles.dm
View File

@@ -55,18 +55,6 @@
icon = 'icons/obj/machines/sleeper.dmi'
icon_state = "sleeper"
/obj/effect/mob_spawn/ghost_role/human/fugitive/psykers
name = "mental energizer"
desc = "A cryo sleeper modified to keep the occupant mentally sharp. However that works..."
icon_state = "psykerpod"
prompt_name = "a psyker-hunter"
mob_species = /datum/species/human
outfit = /datum/outfit/psyker
/obj/effect/mob_spawn/ghost_role/human/fugitive/psykers/captain
prompt_name = "a psyker-hunter captain"
outfit = /datum/outfit/psyker/captain
/obj/effect/mob_spawn/ghost_role/human/fugitive/bounty/Destroy()
var/obj/structure/fluff/empty_sleeper/S = new(drop_location())
S.setDir(dir)
@@ -81,7 +69,7 @@
/obj/effect/mob_spawn/ghost_role/human/fugitive/bounty/synth
outfit = /datum/outfit/bountysynth
/obj/effect/mob_spawn/ghost_role/human/fugitive/bounty/psyker
/obj/effect/mob_spawn/ghost_role/human/fugitive/psyker
name = "mental energizer"
desc = "A cryo sleeper modified to keep the occupant mentally sharp. However that works..."
icon_state = "psykerpod"
@@ -92,19 +80,19 @@
back_story = HUNTER_PACK_PSYKER
outfit = /datum/outfit/psyker
/obj/effect/mob_spawn/ghost_role/human/fugitive/bounty/psyker/captain
/obj/effect/mob_spawn/ghost_role/human/fugitive/psyker/captain
prompt_name = "a psyker Captain"
back_story = HUNTER_PACK_PSYKER
outfit = /datum/outfit/psyker/captain
/obj/effect/mob_spawn/ghost_role/human/fugitive/bounty/psyker/seer
/obj/effect/mob_spawn/ghost_role/human/fugitive/psyker/seer
name = "cryosleep pod"
desc = "A dingy, poorly maintained, but still run-of-the-mill cryo sleeper."
icon = 'icons/obj/machines/sleeper.dmi'
icon_state = "sleeper"
prompt_name = "a psyker seer"
you_are_text = "psyker seer"
flavour_text = "Oh great, the fortunte-tellers want my help with something again. They picked up up while I was space-hitchhiking, said they would take me anywhere \
you_are_text = "Ugh, I'm the Psyker Seer."
flavour_text = "Oh great, the fortunte-tellers want my help with something again. They picked me up while I was space-hitchhiking, said they would take me anywhere \
if I assisted them with my 'flesh-gaze'. They're a bunch of freaks, but at least they leave me be after I'm done helping them..."
back_story = HUNTER_PACK_PSYKER
outfit = /datum/outfit/psyker_seer

BIN
icons/effects/mapping_helpers.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 26 KiB