Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
329064f
faction task edit thing
JustLoveBeingAnOwl Nov 13, 2024
6b115b3
makes the generic ID spawn
JustLoveBeingAnOwl Nov 13, 2024
2e15a35
more notes stuff
JustLoveBeingAnOwl Nov 14, 2024
c53d364
revised the note
JustLoveBeingAnOwl Nov 14, 2024
0810b39
urist wrote the note this itme
JustLoveBeingAnOwl Nov 14, 2024
18181d0
typo fix lol
JustLoveBeingAnOwl Nov 14, 2024
cfed03a
Merge branch 'thegrovellingpeasant:main' into heist-additions
JustLoveBeingAnOwl Nov 25, 2024
2c2ba08
fix for id thingy
JustLoveBeingAnOwl Nov 25, 2024
0b13f16
Merge branch 'thegrovellingpeasant:main' into heist-additions
JustLoveBeingAnOwl Nov 29, 2024
1b80d3c
adds new cards and updates the heister spawner stuff
JustLoveBeingAnOwl Nov 29, 2024
d0a223e
Merge branch 'thegrovellingpeasant:main' into heist-additions
JustLoveBeingAnOwl Dec 11, 2024
b5d5016
adds convicts to possible heisting
JustLoveBeingAnOwl Dec 12, 2024
7d80979
total acid and ash storm death
JustLoveBeingAnOwl Dec 13, 2024
1476945
more changes to hella disable ash rain and duststorms
JustLoveBeingAnOwl Dec 13, 2024
23aeff5
Merge branch 'thegrovellingpeasant:main' into heist-additions
JustLoveBeingAnOwl Dec 19, 2024
aade5b3
destroys the hell out of sandstrom...'s spawn probability
JustLoveBeingAnOwl Dec 19, 2024
7e7f3f8
lowers probability, fixes penthouse doors, adjusts card id icon again
JustLoveBeingAnOwl Dec 20, 2024
eda743e
faction task adjustment again and fixes card id
JustLoveBeingAnOwl Dec 20, 2024
d7ef0a7
reverts the map file changes from main
JustLoveBeingAnOwl Dec 20, 2024
4d84cc4
Merge branch 'thegrovellingpeasant:main' into heist-additions
JustLoveBeingAnOwl Dec 20, 2024
5f00912
fixes the item slot stuff
JustLoveBeingAnOwl Dec 20, 2024
ba476c1
Update heist probability because it was at 100 for some reason
JustLoveBeingAnOwl Dec 21, 2024
1d0db60
brings faction_tasks.dm up to line
JustLoveBeingAnOwl Dec 22, 2024
9a4cb7b
okay fine i'll try pulling faction_task.dm from main
JustLoveBeingAnOwl Dec 22, 2024
e7f3060
Merge branch 'thegrovellingpeasant:main' into heist-additions
JustLoveBeingAnOwl Dec 22, 2024
0abff5b
faction_task.dm updated once more
JustLoveBeingAnOwl Dec 22, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion code/controllers/subsystem/faction_task.dm
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,12 @@ GLOBAL_LIST_INIT(faction_task_probabilities, list(
"/datum/job/citizens/f13tourist" = list(
"/datum/faction_task/individual_player/heist" = 100,
),
"/datum/job/wastes/f13vagrant" = list(
"/datum/faction_task/individual_player/heist" = 100,
),
"datum/job/citzens/f13convict" = list(
"/datum/faction_task/individual_player/heist" = 100,
),
))

GLOBAL_DATUM_INIT(faction_task_controller, /datum/faction_task_controller, new)
Expand Down Expand Up @@ -642,11 +648,18 @@ GLOBAL_LIST_INIT(faction_relics, list(
/datum/faction_task/individual_player/heist
name = "Heist"
max_players = 5
player_chance = 75
player_chance = 15
var/datum/job/target_faction
var/obj/target
var/area/drop_off

/datum/faction_task/individual_player/heist/add_player(mob/living/user)
var/obj/item/card/id/reno/heisters/heister_id = new /obj/item/card/id/reno/heisters(get_turf(user))
var/obj/item/paper/heist/heist_note = new /obj/item/paper/heist(get_turf(user))
user.equip_to_slot_if_possible(heister_id, ITEM_SLOT_ID)
user.put_in_inactive_hand(heist_note)
. = ..()

/datum/faction_task/individual_player/heist/New()
..()
addtimer(CALLBACK(src, PROC_REF(pick_target)), 225 SECONDS)
Expand Down
7 changes: 4 additions & 3 deletions code/datums/weather/weather_types/acid_rain.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/datum/weather/acid_rain
name = "acid rain"
desc = "The planet's thunderstorms are by nature acidic, and will incinerate anyone standing beneath them without protection."
probability = 2
probability = 0

telegraph_duration = 400
telegraph_message = span_userdanger("Thunder rumbles far above. You hear droplets drumming against the canopy. Seek shelter.")
Expand All @@ -17,7 +17,8 @@
end_message = span_boldannounce("The downpour gradually slows to a light shower. It should be safe outside now.")
end_sound = 'sound/ambience/acidrain_end.ogg'

area_types = list(/area/f13/wasteland, /area/f13/desert, /area/f13/farm, /area/f13/forest, /area/f13/ruins)
//area_types = list(/area/f13/wasteland, /area/f13/desert, /area/f13/farm, /area/f13/forest, /area/f13/ruins)
area_types = list(/area)
protected_areas = list(/area/shuttle)
target_trait = ZTRAIT_STATION
protect_indoors = TRUE
Expand All @@ -31,7 +32,7 @@
/datum/weather/acid_rain/weather_act(mob/living/L)
var/resist = L.getarmor(null, "acid")
if(prob(max(0,100-resist)))
L.acid_act(90, 10)
L.acid_act(60, 10)
L.adjustFireLoss(4)

/datum/weather/acid_rain/weather_act_turf(turf/T)
Expand Down
10 changes: 6 additions & 4 deletions code/datums/weather/weather_types/ash_storm.dm
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,14 @@
end_duration = 300
end_overlay = "light_ash"

area_types = list(/area/f13/wasteland, /area/f13/desert, /area/f13/farm, /area/f13/forest, /area/f13/ruins)
//area_types = list(/area/f13/wasteland, /area/f13/desert, /area/f13/farm, /area/f13/forest, /area/f13/ruins)
area_types = list(/area)
protect_indoors = TRUE
target_trait = ZTRAIT_ASHSTORM

immunity_type = "ash"

probability = 90
probability = 0

barometer_predictable = TRUE

Expand Down Expand Up @@ -104,7 +105,7 @@
/datum/weather/ash_storm/sandstorm
name = "sandstorm"
desc = "A passing sand storm blankets the area in harmless sands."
probability = 15
probability = 0

telegraph_message = span_userdanger("Sandstorm is coming to the area, decreasing overall visibility outside.")

Expand Down Expand Up @@ -134,7 +135,8 @@
end_duration = 3000
end_overlay = "light_ash"

area_types = list(/area/f13/wasteland, /area/f13/desert, /area/f13/farm, /area/f13/forest, /area/f13/ruins)
//area_types = list(/area/f13/wasteland, /area/f13/desert, /area/f13/farm, /area/f13/forest, /area/f13/ruins)
area_types = list(/area)
protect_indoors = TRUE
target_trait = ZTRAIT_STATION

Expand Down
4 changes: 4 additions & 0 deletions code/game/machinery/doors/airlock_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,10 @@
damage_deflection = 44
security_level = 6

/obj/machinery/door/airlock/vault/heist
name = "mysterious door"
req_one_access = (ACCESS_HEIST)

//////////////////////////////////
/*
Hatch Airlocks
Expand Down
12 changes: 12 additions & 0 deletions code/game/objects/items/cards_ids.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1741,3 +1741,15 @@
/obj/item/card/id/reno/vangraffs/business/management
desc = "It has eggshell coloring."
icon_state = "business_card_2"

//////////////////
/// Heist Boys ///
//////////////////

/obj/item/card/id/reno/heisters
name = "NCR citizenship permit"
desc = "A plain, though worn, ID permit for an NCR citizen... or is it?"
icon_state = "doctor"
item_state = "card-doctor"
access = list(ACCESS_HEIST)
uses_overlays = FALSE
179 changes: 173 additions & 6 deletions code/modules/paperwork/paper_premade.dm
Original file line number Diff line number Diff line change
Expand Up @@ -690,21 +690,179 @@ Temperance Union members harbor a deep-seated distrust in the effectiveness of c

/obj/item/paper/vangraffs
name = "To The New Robotics Contractor"
desc = "If you're reading this it means Chop Van Graff failed to properly update her instructional note."
desc = "If you're reading this, you have chosen or been chosen to be an assistant roboticist."
icon_state = "paper_words"
info = {"ChopChop please."}
info = {"<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Van Graff Instructions</title>
<style>
body {
font-family: Arial, sans-serif;
line-height: 1.6;
margin: 20px;
}
h1 {
color: #333;
}
ul {
margin: 10px 0;
}
li {
margin: 5px 0;
}
.warning {
color: red;
font-weight: bold;
}
</style>
</head>
<body>

<h1>Instructions from Van Graff Branch Manager</h1>

<p>I don’t like to be official, so let’s make this quick and easy.</p>

<p>Besides energy weapon sales, we get major profits from robot sales and upgrades. Naturally, those require resources. That’s where you come in.</p>

<p>There are two ways to acquire raw metals for robot crafting:</p>
<ul>
<li>Manually in the underground mine Northeast of the town</li>
<li>Importing it from the NCR Correctional Facility</li>
</ul>

<p>The import prices per single ore piece are as follows:</p>
<ul>
<li>Iron - 2 caps</li>
<li>Plasma - 4 caps</li>
<li>Silver - 6 caps</li>
<li>Gold - 8 caps</li>
<li>Titanium - 9 caps</li>
<li>Uranium - 11 caps</li>
<li>Diamond - 15 caps</li>
</ul>

<p class="warning">If the profit on these sales doesn’t outstrip the cost of resources, you’re not just wasting my time—you’re making a serious mistake. Don’t bring in a damn thing that costs more than it’s worth. I’m trusting you to handle this with professionalism. Fail to uphold these standards and our next conversation won’t just be unpleasant. It’ll be the last talk you ever have.</p>

<p>- Van Graff Branch Manager</p>

</body>
</html>"}

/obj/item/paper/wrights
name = "Wright Export Contract"
desc = "If you're reading this it means Chop Wright failed to do her chores and must be sternly corrected."
desc = "If you're reading this it means your family or an associate of the Wrights family has something new cooked up."
icon_state = "paper_words"
info = {"ChopChop please."}
info = {"<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Welcome Message</title>
<style>
body {
font-family: Arial, sans-serif;
line-height: 1.6;
margin: 20px;
}
h1 {
color: #333;
}
ul {
margin: 10px 0;
}
li {
margin: 5px 0;
}
.warning {
color: red;
font-weight: bold;
}
</style>
</head>
<body>

<h1><p>Ladies and gentlemen,</p></h1>

<p>It is my pleasure to acquaint you, our newest and most distinguished hires, with the fundamental duties that lie ahead. Beyond overseeing the clinic, we are also engaged in the profitable enterprise of exporting raw resources via train.</p>

<p>These resources may be obtained through the rather unfortunate yet necessary menial labor conducted in the mines northeast of New Reno. Alternatively, one may procure ore imported directly from the NCR Prison, following the rates listed here per individual piece of ore:</p>

<ul>
<li>Iron - 2 caps</li>
<li>Plasma - 4 caps</li>
<li>Silver - 6 caps</li>
<li>Gold - 8 caps</li>
<li>Titanium - 9 caps</li>
<li>Uranium - 11 caps</li>
<li>Diamond - 15 caps</li>
</ul>

<p>Once the ore is acquired, it is exported via our rail line in bulk at established rates, a highly profitable venture that secures our standing here in New Reno. Do not falter in this task; a considerable responsibility rests upon you to uphold the family’s interests.</p>

<p class="warning">Rest assured, you are being watched—not only by us but, indeed, by Providence itself.</p>

</body>
</html>"}

/obj/item/paper/ncrcf
name = "Instructions for the NCRCF"
desc = "If you're reading this it means the first girlboss senator has failed utterly. - Kimball and the Boys."
desc = "If you're reading this, it means you're here to police the dregs of society rather than being on the frontlines."
icon_state = "paper_words"
info = {"ChopChop please."}
info = {"<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Motivational Speech</title>
<style>
body {
font-family: Arial, sans-serif;
line-height: 1.6;
margin: 20px;
background-color: #f9f9f9;
color: #333;
}
h1 {
color: #c00;
}
ul {
margin: 10px 0;
}
li {
margin: 5px 0;
}
.warning {
color: red;
font-weight: bold;
}
</style>
</head>
<body>

<h1>NOTICE MEMO 3471</h1>

<p>LISTEN UP, YOU SORRY SACKS OF FILTH. YOU MIGHT BE OUT OF THE ARMY BUT THAT DOESN'T MEAN YOU GET TO SIT AROUND PLAYING WITH TEA CUPS LIKE A BUNCH OF HELPLESS GRANDMAS. THIS ISN'T A DAYCARE CENTER - THIS PRISON IS OUR GOVERNMENT'S PRIDE AND JOY, AND I'LL BE DAMNED IF YOU'RE GONNA BE THE CLOWNS WHO SCREW IT UP.</p>

<p>YOUR JOB ISN'T JUST TO BABYSIT INMATES; YOU'VE GOT TO MAKE SURE THOSE WORTHLESS WORMS DIG UP EVERY OUNCE OF ORE IN THE MINE. THAT ORE ISN'T JUST DIRT, IT'S PROFIT FOR THIS WHOLE OPERATION. YOU EXPORT THE ORE STRAIGHT TO THE VAN GRAFF FAMILY FOR THEIR ROBOT FREAKSHOWS AND THE WRIGHTS TO SHIP IT OUT VIA TRAIN.</p>

<p>HERE ARE ORE PRICES:</p>
<ul>
<li>IRON - 2 CAPS</li>
<li>PLASMA - 4 CAPS</li>
<li>SILVER - 6 CAPS</li>
<li>GOLD - 8 CAPS</li>
<li>TITANIUM - 9 CAPS</li>
<li>URANIUM - 11 CAPS</li>
<li>DIAMOND - 15 CAPS</li>
</ul>

<p>THIS ISN'T YOUR MOTHER'S BACKYARD PROJECT; THIS OPERATION KEEPS THIS PLACE RUNNING. GET IT THROUGH YOUR THICK SKULLS AND ACT LIKE IT, OR SO HELP ME, I'M GOING TO MAKE GOD HIMSELF COME DOWN SWINGING A HAMMER BIGGER THAN VAULT-CITY AND CRUSH WHATEVER'S LEFT OF YOUR SORRY EXCUSES FOR MANHOOD. MAKE THIS UNIT PROUD OR I WILL PERSONALLY MAKE SURE YOU REGRET IT.</p>

</body>
</html>"}

/obj/item/paper/bishops
name = "Word to the Wise"
Expand All @@ -713,3 +871,12 @@ Temperance Union members harbor a deep-seated distrust in the effectiveness of c
info = {"<center>Money Making Opportunity</center><br><br>
To anyone interested in making some caps, we've cut a deal with the prison commissary robot to begin moving chems into the NCR Correctional Facility. Get the chems from our supply in the Shark Club, sneak them in somehow, load up his machine, cash out, and find a way to get the caps out of the prison. Don't screw this up, capisce?<br><br><br>
<center>- Yours truly and anonymously</center>"}

/obj/item/paper/heist
name = "Burn After Reading."
desc = "A note given to those who have no qualms about disrupting the gangs of New Reno.."
icon_state = "paper_words"
info = {"<center>To the crew,</center><br><br>
As a reminder: The clubhouse is just northeast of town in the tribal camp. Follow the I-80 east until you find the ruined town, then follow the dirt path north and east until you see the green lady. Head through the gate, the elevator to the penthouse is inside working, we got the placed cleaned up and loaded with supplies for your job. Bring the artifact there, get it open, then kick up your feet with some champagne. I can’t wait to see what’s inside..<br><br><br>
<center>- M. </center><br><br>
<center>P.S. Snitches will be shot- burn this note! </center>"}