Skip to content

Commit

Permalink
ports some events
Browse files Browse the repository at this point in the history
  • Loading branch information
timothyteakettle committed Jun 15, 2020
1 parent 1683829 commit d7bce8a
Show file tree
Hide file tree
Showing 45 changed files with 2,932 additions and 12 deletions.
490 changes: 490 additions & 0 deletions _maps/shuttles/hunter_bounty.dmm

Large diffs are not rendered by default.

502 changes: 502 additions & 0 deletions _maps/shuttles/hunter_russian.dmm

Large diffs are not rendered by default.

253 changes: 253 additions & 0 deletions _maps/shuttles/hunter_space_cop.dmm
Original file line number Diff line number Diff line change
@@ -0,0 +1,253 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"aa" = (
/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/hunter{
dir = 8;
view_range = 7;
x_offset = 6
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/hunter)
"ab" = (
/obj/machinery/computer/shuttle/hunter{
dir = 8
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/hunter)
"ac" = (
/obj/structure/fans/tiny,
/obj/docking_port/stationary{
dir = 4;
dwidth = 3;
height = 12;
id = "huntership_home";
name = "Deep Space";
width = 7
},
/obj/docking_port/mobile{
dir = 4;
dwidth = 3;
height = 12;
id = "huntership";
name = "hunter shuttle";
rechargeTime = 1800;
width = 7
},
/obj/machinery/door/poddoor/shutters{
id = "Interpolship"
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/hunter)
"ae" = (
/obj/machinery/button/door{
id = "Interpolship";
pixel_y = 26
},
/obj/effect/turf_decal/stripes{
dir = 8
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/hunter)
"af" = (
/obj/effect/turf_decal/stripes{
dir = 8
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/hunter)
"ag" = (
/obj/effect/turf_decal/delivery,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/hunter)
"ah" = (
/obj/effect/turf_decal/loading_area{
dir = 4
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/hunter)
"aj" = (
/obj/structure/closet/crate/eva,
/obj/effect/turf_decal/box,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/hunter)
"ak" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/obj/effect/mob_spawn/human/fugitive/spacepol{
dir = 1
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/hunter)
"al" = (
/obj/effect/turf_decal/stripes{
dir = 8
},
/obj/effect/turf_decal/caution{
dir = 4
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/hunter)
"bY" = (
/obj/structure/chair/comfy/shuttle,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/hunter)
"gi" = (
/obj/structure/table,
/obj/effect/mob_spawn/human/fugitive/spacepol{
dir = 8
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/hunter)
"hB" = (
/obj/structure/shuttle/engine/propulsion{
dir = 8
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/hunter)
"hJ" = (
/obj/structure/window/shuttle,
/obj/structure/grille,
/turf/open/floor/plating,
/area/shuttle/hunter)
"ku" = (
/turf/closed/wall/mineral/titanium,
/area/shuttle/hunter)
"lp" = (
/obj/machinery/fugitive_capture,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/hunter)
"rR" = (
/obj/machinery/door/airlock/titanium,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/hunter)
"te" = (
/obj/structure/fans/tiny,
/obj/machinery/door/poddoor/shutters{
id = "Interpolship"
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/hunter)
"An" = (
/obj/effect/spawner/structure/window/shuttle,
/turf/open/floor/plating,
/area/shuttle/hunter)
"Pq" = (
/turf/template_noop,
/area/template_noop)
"Rz" = (
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/hunter)
"RO" = (
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/hunter)

(1,1,1) = {"
Pq
ku
te
ac
te
ku
Pq
"}
(2,1,1) = {"
Pq
ku
ae
al
af
ku
Pq
"}
(3,1,1) = {"
Pq
ku
bY
RO
ak
ku
Pq
"}
(4,1,1) = {"
hB
ku
bY
RO
ak
ku
hB
"}
(5,1,1) = {"
ku
ku
bY
RO
ak
ku
ku
"}
(6,1,1) = {"
Pq
hJ
ag
RO
RO
hJ
Pq
"}
(7,1,1) = {"
Pq
hJ
ah
RO
aj
hJ
Pq
"}
(8,1,1) = {"
Pq
ku
lp
RO
aj
ku
Pq
"}
(9,1,1) = {"
hB
ku
ku
rR
ku
ku
hB
"}
(10,1,1) = {"
ku
ku
RO
Rz
RO
ku
ku
"}
(11,1,1) = {"
Pq
An
aa
gi
ab
An
Pq
"}
(12,1,1) = {"
Pq
ku
An
An
An
ku
Pq
"}
11 changes: 11 additions & 0 deletions code/__DEFINES/antagonists.dm
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,17 @@
#define NUKE_RESULT_WRONG_STATION 7
#define NUKE_RESULT_WRONG_STATION_DEAD 8

//fugitive end results
#define FUGITIVE_RESULT_BADASS_HUNTER 0
#define FUGITIVE_RESULT_POSTMORTEM_HUNTER 1
#define FUGITIVE_RESULT_MAJOR_HUNTER 2
#define FUGITIVE_RESULT_HUNTER_VICTORY 3
#define FUGITIVE_RESULT_MINOR_HUNTER 4
#define FUGITIVE_RESULT_STALEMATE 5
#define FUGITIVE_RESULT_MINOR_FUGITIVE 6
#define FUGITIVE_RESULT_FUGITIVE_VICTORY 7
#define FUGITIVE_RESULT_MAJOR_FUGITIVE 8

#define APPRENTICE_DESTRUCTION "destruction"
#define APPRENTICE_BLUESPACE "bluespace"
#define APPRENTICE_ROBELESS "robeless"
Expand Down
1 change: 1 addition & 0 deletions code/__DEFINES/atom_hud.dm
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
#define ANTAG_HUD_CLOCKWORK 22
#define ANTAG_HUD_BROTHER 23
#define ANTAG_HUD_BLOODSUCKER 24
#define ANTAG_HUD_FUGITIVE 25

// Notification action types
#define NOTIFY_JUMP "jump"
Expand Down
2 changes: 2 additions & 0 deletions code/__DEFINES/status_effects.dm
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@

#define STATUS_EFFECT_SPASMS /datum/status_effect/spasms //causes random muscle spasms

#define STATUS_EFFECT_FAKE_VIRUS /datum/status_effect/fake_virus //gives you fluff messages for cough, sneeze, headache, etc but without an actual virus

#define STATUS_EFFECT_BREASTS_ENLARGEMENT /datum/status_effect/chem/breast_enlarger //Applied slowdown due to the ominous bulk.

#define STATUS_EFFECT_PENIS_ENLARGEMENT /datum/status_effect/chem/penis_enlarger //More applied slowdown, just like the above.
Expand Down
3 changes: 3 additions & 0 deletions code/_globalvars/lists/flavor_misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -223,3 +223,6 @@ GLOBAL_LIST_INIT(station_numerals, greek_letters + phonetic_alphabet + numbers_a
GLOBAL_LIST_INIT(admiral_messages, list("Do you know how expensive these stations are?","Stop wasting my time.","I was sleeping, thanks a lot.","Stand and fight you cowards!","You knew the risks coming in.","Stop being paranoid.","Whatever's broken just build a new one.","No.", "<i>null</i>","<i>Error: No comment given.</i>", "It's a good day to die!"))

GLOBAL_LIST_INIT(redacted_strings, list("\[REDACTED\]", "\[CLASSIFIED\]", "\[ARCHIVED\]", "\[EXPLETIVE DELETED\]", "\[EXPUNGED\]", "\[INFORMATION ABOVE YOUR SECURITY CLEARANCE\]", "\[MOVE ALONG CITIZEN\]", "\[NOTHING TO SEE HERE\]", "\[ACCESS DENIED\]"))


GLOBAL_LIST_INIT(wisdoms, world.file2list("strings/wisdoms.txt"))
4 changes: 3 additions & 1 deletion code/_globalvars/lists/poll_ignore.dm
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#define POLL_IGNORE_WIZARD "wizard"
#define POLL_IGNORE_CLONE "clone"
#define POLL_IGNORE_CONTRACTOR_SUPPORT "contractor_support"
#define POLL_IGNORE_FUGITIVE "fugitive"

GLOBAL_LIST_INIT(poll_ignore_desc, list(
POLL_IGNORE_SENTIENCE_POTION = "Sentience potion",
Expand All @@ -39,7 +40,8 @@ GLOBAL_LIST_INIT(poll_ignore_desc, list(
POLL_IGNORE_DEMON = "Demons",
POLL_IGNORE_WIZARD = "Wizards",
POLL_IGNORE_CLONE = "Defective/SDGF clones",
POLL_IGNORE_CONTRACTOR_SUPPORT = "Contractor Support Unit"
POLL_IGNORE_CONTRACTOR_SUPPORT = "Contractor Support Unit",
POLL_IGNORE_FUGITIVE = "Fugitive Hunter"
))
GLOBAL_LIST_INIT(poll_ignore, init_poll_ignore())

Expand Down
3 changes: 2 additions & 1 deletion code/datums/hud.dm
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ GLOBAL_LIST_INIT(huds, list(
ANTAG_HUD_SOULLESS = new/datum/atom_hud/antag/hidden(),
ANTAG_HUD_CLOCKWORK = new/datum/atom_hud/antag(),
ANTAG_HUD_BROTHER = new/datum/atom_hud/antag/hidden(),
ANTAG_HUD_BLOODSUCKER = new/datum/atom_hud/antag/bloodsucker()
ANTAG_HUD_BLOODSUCKER = new/datum/atom_hud/antag/bloodsucker(),
ANTAG_HUD_HIVEAWAKE = new/datum/atom_hud/antag()
))

/datum/atom_hud
Expand Down
12 changes: 12 additions & 0 deletions code/datums/shuttles.dm
Original file line number Diff line number Diff line change
Expand Up @@ -613,3 +613,15 @@
/datum/map_template/shuttle/snowdin/excavation
suffix = "excavation"
name = "Snowdin Excavation Elevator"

/datum/map_template/shuttle/hunter/space_cop
suffix = "space_cop"
name = "Police Spacevan"

/datum/map_template/shuttle/hunter/russian
suffix = "russian"
name = "Russian Cargo Ship"

/datum/map_template/shuttle/hunter/bounty
suffix = "bounty"
name = "Bounty Hunter Ship"
41 changes: 41 additions & 0 deletions code/datums/status_effects/debuffs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -795,3 +795,44 @@ datum/status_effect/pacify
name = "Genetic Breakdown"
desc = "I don't feel so good. Your body can't handle the mutations! You have one minute to remove your mutations, or you will be met with a horrible fate."
icon_state = "dna_melt"

/datum/status_effect/fake_virus
id = "fake_virus"
duration = 1800//3 minutes
status_type = STATUS_EFFECT_REPLACE
tick_interval = 1
alert_type = null
var/msg_stage = 0//so you dont get the most intense messages immediately

/datum/status_effect/fake_virus/tick()
var/fake_msg = ""
var/fake_emote = ""
switch(msg_stage)
if(0 to 300)
if(prob(1))
fake_msg = pick("<span class='warning'>[pick("Your head hurts.", "Your head pounds.")]</span>",
"<span class='warning'>[pick("You're having difficulty breathing.", "Your breathing becomes heavy.")]</span>",
"<span class='warning'>[pick("You feel dizzy.", "Your head spins.")]</span>",
"<span notice='warning'>[pick("You swallow excess mucus.", "You lightly cough.")]</span>",
"<span class='warning'>[pick("Your head hurts.", "Your mind blanks for a moment.")]</span>",
"<span class='warning'>[pick("Your throat hurts.", "You clear your throat.")]</span>")
if(301 to 600)
if(prob(2))
fake_msg = pick("<span class='warning'>[pick("Your head hurts a lot.", "Your head pounds incessantly.")]</span>",
"<span class='warning'>[pick("Your windpipe feels like a straw.", "Your breathing becomes tremendously difficult.")]</span>",
"<span class='warning'>You feel very [pick("dizzy","woozy","faint")].</span>",
"<span class='warning'>[pick("You hear a ringing in your ear.", "Your ears pop.")]</span>",
"<span class='warning'>You nod off for a moment.</span>")
else
if(prob(3))
if(prob(50))// coin flip to throw a message or an emote
fake_msg = pick("<span class='userdanger'>[pick("Your head hurts!", "You feel a burning knife inside your brain!", "A wave of pain fills your head!")]</span>",
"<span class='userdanger'>[pick("Your lungs hurt!", "It hurts to breathe!")]</span>",
"<span class='warning'>[pick("You feel nauseated.", "You feel like you're going to throw up!")]</span>")
else
fake_emote = pick("cough", "sniff", "sneeze")
if(fake_emote)
owner.emote(fake_emote)
else if(fake_msg)
to_chat(owner, fake_msg)
msg_stage++
7 changes: 7 additions & 0 deletions code/game/area/areas/shuttles.dm
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,13 @@
/area/shuttle/abandoned/pod
name = "Abandoned Ship Pod"

////////////////////////////Bounty Hunter Shuttles////////////////////////////
/area/shuttle/hunter
name = "Hunter Shuttle"
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
blob_allowed = FALSE
canSmoothWithAreas = /area/shuttle/hunter

////////////////////////////Single-area shuttles////////////////////////////

/area/shuttle/transit
Expand Down
Loading

0 comments on commit d7bce8a

Please sign in to comment.