From 329064f31f91011e4521196a221cdbea0f7533f5 Mon Sep 17 00:00:00 2001 From: Owl Date: Wed, 13 Nov 2024 15:54:23 -0600 Subject: [PATCH 01/20] faction task edit thing --- code/controllers/subsystem/faction_task.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/controllers/subsystem/faction_task.dm b/code/controllers/subsystem/faction_task.dm index ab1b82a6f..e48f4c3fb 100644 --- a/code/controllers/subsystem/faction_task.dm +++ b/code/controllers/subsystem/faction_task.dm @@ -41,6 +41,9 @@ 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, + ), )) GLOBAL_DATUM_INIT(faction_task_controller, /datum/faction_task_controller, new) @@ -668,9 +671,6 @@ GLOBAL_LIST_INIT(faction_relics, list( else return "The heist failed." - - - /////////////////// /* Miscellaneous */ /////////////////// From 6b115b3c3a8d4a7d59f93cffcf4f762f29676cfb Mon Sep 17 00:00:00 2001 From: Owl Date: Wed, 13 Nov 2024 16:49:51 -0600 Subject: [PATCH 02/20] makes the generic ID spawn --- code/controllers/subsystem/faction_task.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/controllers/subsystem/faction_task.dm b/code/controllers/subsystem/faction_task.dm index e48f4c3fb..8c08d148f 100644 --- a/code/controllers/subsystem/faction_task.dm +++ b/code/controllers/subsystem/faction_task.dm @@ -647,6 +647,11 @@ GLOBAL_LIST_INIT(faction_relics, list( var/obj/target var/area/drop_off +/datum/faction_task/individual_player/heist/add_player(mob/living/user) + . = ..() + var/obj/item/card/id/heister_id = new /obj/item/card/id(get_turf(user)) + user.put_in_active_hand(heister_id) + /datum/faction_task/individual_player/heist/New() ..() addtimer(CALLBACK(src, .proc/pick_target), 225 SECONDS) From 2e15a352079471fb9cef7348ce842daabfb058fb Mon Sep 17 00:00:00 2001 From: Owl Date: Wed, 13 Nov 2024 21:26:28 -0600 Subject: [PATCH 03/20] more notes stuff --- code/controllers/subsystem/faction_task.dm | 2 + code/modules/paperwork/paper_premade.dm | 178 ++++++++++++++++++++- 2 files changed, 174 insertions(+), 6 deletions(-) diff --git a/code/controllers/subsystem/faction_task.dm b/code/controllers/subsystem/faction_task.dm index 8c08d148f..a96ddca57 100644 --- a/code/controllers/subsystem/faction_task.dm +++ b/code/controllers/subsystem/faction_task.dm @@ -650,7 +650,9 @@ GLOBAL_LIST_INIT(faction_relics, list( /datum/faction_task/individual_player/heist/add_player(mob/living/user) . = ..() var/obj/item/card/id/heister_id = new /obj/item/card/id(get_turf(user)) + var/obj/item/paper/heist/heist_note = new /obj/item/paper/heist(get_turf(user)) user.put_in_active_hand(heister_id) + user.put_in_inactive_hand(heist_note) /datum/faction_task/individual_player/heist/New() ..() diff --git a/code/modules/paperwork/paper_premade.dm b/code/modules/paperwork/paper_premade.dm index fe0a481ad..beb21b783 100644 --- a/code/modules/paperwork/paper_premade.dm +++ b/code/modules/paperwork/paper_premade.dm @@ -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 = {" + + + + + Van Graff Instructions + + + + +

Instructions from Van Graff Branch Manager

+ +

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

+ +

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

+ +

There are two ways to acquire raw metals for robot crafting:

+
    +
  • Manually in the underground mine Northeast of the town
    • +
  • Importing it from the NCR Correctional Facility
    • +
+ +

The import prices per single ore piece are as follows:

+
    +
  • Iron - 2 caps
    • +
  • Plasma - 4 caps
    • +
  • Silver - 6 caps
    • +
  • Gold - 8 caps
    • +
  • Titanium - 9 caps
    • +
  • Uranium - 11 caps
    • +
  • Diamond - 15 caps
    • +
+ +

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.

+ +

- Van Graff Branch Manager

+ + +"} /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 = {" + + + + + Welcome Message + + + + +

Ladies and gentlemen,

+ +

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.

+ +

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:

+ +
    +
  • Iron - 2 caps
    • +
  • Plasma - 4 caps
    • +
  • Silver - 6 caps
    • +
  • Gold - 8 caps
    • +
  • Titanium - 9 caps
    • +
  • Uranium - 11 caps
    • +
  • Diamond - 15 caps
    • +
+ +

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.

+ +

Rest assured, you are being watched—not only by us but, indeed, by Providence itself.

+ + +"} /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 = {" + + + + + Motivational Speech + + + + +

NOTICE MEMO 3471

+ +

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.

+ +

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.

+ +

HERE ARE ORE PRICES:

+
    +
  • IRON - 2 CAPS
    • +
  • PLASMA - 4 CAPS
    • +
  • SILVER - 6 CAPS
    • +
  • GOLD - 8 CAPS
    • +
  • TITANIUM - 9 CAPS
    • +
  • URANIUM - 11 CAPS
    • +
  • DIAMOND - 15 CAPS
    • +
+ +

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.

+ + +"} /obj/item/paper/bishops name = "Word to the Wise" @@ -713,3 +871,11 @@ Temperance Union members harbor a deep-seated distrust in the effectiveness of c info = {"
Money Making Opportunity


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?


- Yours truly and anonymously
"} + +/obj/item/paper/heist + name = "For Adventurous Loot-Claimers." + desc = "A note given to those who have no qualms about disrupting the gangs of New Reno.." + icon_state = "paper_words" + info = {"
To our esteemed heisters,


+ You will find our operations by following the big Eighty east, past the prison. Go up the dirt road and enter the 'OH' tiki resort. Look next to that quaint little altar- the elevator will take you down. +
Yours truly, a benevolent treasure hunter.
"} From c53d3641203f55fb9e83eb40845162c445622236 Mon Sep 17 00:00:00 2001 From: Owl Date: Thu, 14 Nov 2024 09:18:37 -0600 Subject: [PATCH 04/20] revised the note --- code/modules/paperwork/paper_premade.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/paperwork/paper_premade.dm b/code/modules/paperwork/paper_premade.dm index beb21b783..f7d12a0cd 100644 --- a/code/modules/paperwork/paper_premade.dm +++ b/code/modules/paperwork/paper_premade.dm @@ -877,5 +877,5 @@ To anyone interested in making some caps, we've cut a deal with the prison commi desc = "A note given to those who have no qualms about disrupting the gangs of New Reno.." icon_state = "paper_words" info = {"
To our esteemed heisters,


- You will find our operations by following the big Eighty east, past the prison. Go up the dirt road and enter the 'OH' tiki resort. Look next to that quaint little altar- the elevator will take you down. -
Yours truly, a benevolent treasure hunter.
"} + You will find our operations by following the main road, Interstate-Eighty, far east, past the prison. Once you find a dirt-road take it north, and enter the 'OH' tiki resort once you find it. You should be just northwest of town. Look next to that quaint little altar- the elevator will take you down.


+
- Yours truly, a benevolent treasure hunter.
"} From 0810b393915e39bcb4fd92431a2675dca79ec443 Mon Sep 17 00:00:00 2001 From: Owl Date: Thu, 14 Nov 2024 12:21:41 -0600 Subject: [PATCH 05/20] urist wrote the note this itme --- code/modules/paperwork/paper_premade.dm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/code/modules/paperwork/paper_premade.dm b/code/modules/paperwork/paper_premade.dm index f7d12a0cd..68d495f93 100644 --- a/code/modules/paperwork/paper_premade.dm +++ b/code/modules/paperwork/paper_premade.dm @@ -873,9 +873,10 @@ To anyone interested in making some caps, we've cut a deal with the prison commi
- Yours truly and anonymously
"} /obj/item/paper/heist - name = "For Adventurous Loot-Claimers." + 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 = {"
To our esteemed heisters,


- You will find our operations by following the main road, Interstate-Eighty, far east, past the prison. Once you find a dirt-road take it north, and enter the 'OH' tiki resort once you find it. You should be just northwest of town. Look next to that quaint little altar- the elevator will take you down.


-
- Yours truly, a benevolent treasure hunter.
"} + info = {"
To the crew,


+ 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..


+
- - M.


+
- P.S. Snitches will be shot- burtn this note!
"} From 18181d0df060ceae990b6dfdad81a239f55baa0d Mon Sep 17 00:00:00 2001 From: Owl Date: Thu, 14 Nov 2024 17:25:10 -0600 Subject: [PATCH 06/20] typo fix lol --- code/modules/paperwork/paper_premade.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/paperwork/paper_premade.dm b/code/modules/paperwork/paper_premade.dm index 68d495f93..eeb2d7ded 100644 --- a/code/modules/paperwork/paper_premade.dm +++ b/code/modules/paperwork/paper_premade.dm @@ -878,5 +878,5 @@ To anyone interested in making some caps, we've cut a deal with the prison commi icon_state = "paper_words" info = {"
To the crew,


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..


-
- - M.


-
- P.S. Snitches will be shot- burtn this note!
"} +
- M.


+
P.S. Snitches will be shot- burn this note!
"} From 2c2ba08be6fa67c6548425e2c8e0ec4f709264cc Mon Sep 17 00:00:00 2001 From: Owl Date: Sun, 24 Nov 2024 20:24:31 -0600 Subject: [PATCH 07/20] fix for id thingy --- code/controllers/subsystem/faction_task.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/controllers/subsystem/faction_task.dm b/code/controllers/subsystem/faction_task.dm index 4bf99a820..a98c74b4a 100644 --- a/code/controllers/subsystem/faction_task.dm +++ b/code/controllers/subsystem/faction_task.dm @@ -654,9 +654,10 @@ GLOBAL_LIST_INIT(faction_relics, list( . = ..() var/obj/item/card/id/heister_id = new /obj/item/card/id(get_turf(user)) var/obj/item/paper/heist/heist_note = new /obj/item/paper/heist(get_turf(user)) - user.put_in_active_hand(heister_id) + user.equip_to_slot(heister_id, SLOT_WEAR_ID) user.put_in_inactive_hand(heist_note) + /datum/faction_task/individual_player/heist/New() ..() addtimer(CALLBACK(src, PROC_REF(pick_target)), 225 SECONDS) From 1b80d3c3adb5416fe0ec957019b3c2ea73a8dc53 Mon Sep 17 00:00:00 2001 From: LoveBeingAnOwl Date: Fri, 29 Nov 2024 00:19:43 -0600 Subject: [PATCH 08/20] adds new cards and updates the heister spawner stuff --- code/controllers/subsystem/faction_task.dm | 10 ++++++++-- code/game/objects/items/cards_ids.dm | 11 +++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/code/controllers/subsystem/faction_task.dm b/code/controllers/subsystem/faction_task.dm index ce5aa0bcd..1c920fcdc 100644 --- a/code/controllers/subsystem/faction_task.dm +++ b/code/controllers/subsystem/faction_task.dm @@ -652,11 +652,11 @@ GLOBAL_LIST_INIT(faction_relics, list( /datum/faction_task/individual_player/heist/add_player(mob/living/user) . = ..() - var/obj/item/card/id/heister_id = new /obj/item/card/id(get_turf(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(heister_id, SLOT_WEAR_ID) user.put_in_inactive_hand(heist_note) - +/obj/item/card/id/reno/heisters /datum/faction_task/individual_player/heist/New() ..() @@ -670,6 +670,12 @@ GLOBAL_LIST_INIT(faction_relics, list( /datum/faction_task/individual_player/heist/calculate_score() var/turf/T = get_turf(target) if(target && istype(T.loc, drop_off)) + + + + + + return TRUE return FALSE diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index 0e3bc8d1f..241669b2c 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -1741,3 +1741,14 @@ /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) From b5d50160d59cb7f21755546c53034674ec0e87a1 Mon Sep 17 00:00:00 2001 From: Owl Date: Thu, 12 Dec 2024 06:42:09 -0600 Subject: [PATCH 09/20] adds convicts to possible heisting --- code/controllers/subsystem/faction_task.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/controllers/subsystem/faction_task.dm b/code/controllers/subsystem/faction_task.dm index 1c920fcdc..82203fdef 100644 --- a/code/controllers/subsystem/faction_task.dm +++ b/code/controllers/subsystem/faction_task.dm @@ -44,6 +44,9 @@ GLOBAL_LIST_INIT(faction_task_probabilities, list( "/datum/job/wastes/f13vagrant" = list( "/datum/faction_task/individual_player/heist" = 100, ), + "datum/job/citizens/f13convict" = list( + "/datum/faction_task/individual_player/heist" = 100, + ), )) GLOBAL_DATUM_INIT(faction_task_controller, /datum/faction_task_controller, new) @@ -645,7 +648,7 @@ GLOBAL_LIST_INIT(faction_relics, list( /datum/faction_task/individual_player/heist name = "Heist" max_players = 5 - player_chance = 75 + player_chance = 10 var/datum/job/target_faction var/obj/target var/area/drop_off From 7d8097920d0421f8f564f2b21efcef870126f0e6 Mon Sep 17 00:00:00 2001 From: Owl Date: Thu, 12 Dec 2024 18:22:46 -0600 Subject: [PATCH 10/20] total acid and ash storm death --- code/datums/weather/weather_types/acid_rain.dm | 4 ++-- code/datums/weather/weather_types/ash_storm.dm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/datums/weather/weather_types/acid_rain.dm b/code/datums/weather/weather_types/acid_rain.dm index 4517f80e3..2037453ee 100644 --- a/code/datums/weather/weather_types/acid_rain.dm +++ b/code/datums/weather/weather_types/acid_rain.dm @@ -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.") @@ -31,7 +31,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) diff --git a/code/datums/weather/weather_types/ash_storm.dm b/code/datums/weather/weather_types/ash_storm.dm index ebdfd01ab..5efa8bc9f 100644 --- a/code/datums/weather/weather_types/ash_storm.dm +++ b/code/datums/weather/weather_types/ash_storm.dm @@ -22,7 +22,7 @@ immunity_type = "ash" - probability = 90 + probability = 0 barometer_predictable = TRUE @@ -104,7 +104,7 @@ /datum/weather/ash_storm/sandstorm name = "sandstorm" desc = "A passing sand storm blankets the area in harmless sands." - probability = 15 + probability = 10 telegraph_message = span_userdanger("Sandstorm is coming to the area, decreasing overall visibility outside.") From 14769454cc31639c80fb5926eb32c32cc0276421 Mon Sep 17 00:00:00 2001 From: Owl Date: Fri, 13 Dec 2024 09:21:05 -0600 Subject: [PATCH 11/20] more changes to hella disable ash rain and duststorms --- code/datums/weather/weather_types/acid_rain.dm | 3 ++- code/datums/weather/weather_types/ash_storm.dm | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/code/datums/weather/weather_types/acid_rain.dm b/code/datums/weather/weather_types/acid_rain.dm index 2037453ee..c37fdab4b 100644 --- a/code/datums/weather/weather_types/acid_rain.dm +++ b/code/datums/weather/weather_types/acid_rain.dm @@ -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 diff --git a/code/datums/weather/weather_types/ash_storm.dm b/code/datums/weather/weather_types/ash_storm.dm index 5efa8bc9f..ae95ef53b 100644 --- a/code/datums/weather/weather_types/ash_storm.dm +++ b/code/datums/weather/weather_types/ash_storm.dm @@ -16,7 +16,8 @@ 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 @@ -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 From aade5b3d395a2373293347149442962428ad9e82 Mon Sep 17 00:00:00 2001 From: LoveBeingAnOwl Date: Thu, 19 Dec 2024 14:48:49 -0600 Subject: [PATCH 12/20] destroys the hell out of sandstrom...'s spawn probability --- code/datums/weather/weather_types/ash_storm.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/weather/weather_types/ash_storm.dm b/code/datums/weather/weather_types/ash_storm.dm index ae95ef53b..915aa7aa0 100644 --- a/code/datums/weather/weather_types/ash_storm.dm +++ b/code/datums/weather/weather_types/ash_storm.dm @@ -105,7 +105,7 @@ /datum/weather/ash_storm/sandstorm name = "sandstorm" desc = "A passing sand storm blankets the area in harmless sands." - probability = 10 + probability = 0 telegraph_message = span_userdanger("Sandstorm is coming to the area, decreasing overall visibility outside.") From 7e7f3f8352f67413620341dd40d25299e0572ae0 Mon Sep 17 00:00:00 2001 From: LoveBeingAnOwl Date: Thu, 19 Dec 2024 23:12:34 -0600 Subject: [PATCH 13/20] lowers probability, fixes penthouse doors, adjusts card id icon again --- _maps/map_files/Reno/Reno-Surface-2.dmm | 17 ++--------------- code/controllers/subsystem/faction_task.dm | 2 +- code/game/machinery/doors/airlock_types.dm | 4 ++++ code/game/objects/items/cards_ids.dm | 2 -- 4 files changed, 7 insertions(+), 18 deletions(-) diff --git a/_maps/map_files/Reno/Reno-Surface-2.dmm b/_maps/map_files/Reno/Reno-Surface-2.dmm index 53818129e..1101cd8be 100644 --- a/_maps/map_files/Reno/Reno-Surface-2.dmm +++ b/_maps/map_files/Reno/Reno-Surface-2.dmm @@ -8748,10 +8748,7 @@ /obj/machinery/door/poddoor/preopen{ id = "penthouse_ent" }, -/obj/machinery/door/airlock/vault{ - req_access_txt = "168"; - name = "mysterious door" - }, +/obj/machinery/door/airlock/vault/heist, /turf/open/floor/plasteel/f13/vault_floor/plating, /area/f13/reno_tribal) "dKM" = ( @@ -34646,16 +34643,6 @@ /obj/structure/barricade/wooden, /turf/open/indestructible/ground/outside/desert/reno, /area/f13/reno_wasteland) -"otM" = ( -/obj/machinery/door/airlock/vault{ - req_access_txt = "168"; - name = "mysterious door" - }, -/obj/machinery/door/poddoor/preopen{ - id = "penthouse_ent" - }, -/turf/open/floor/plasteel/f13/vault_floor/plating, -/area/f13/reno_tribal) "otT" = ( /obj/structure/rack/shelf_metal, /obj/item/reagent_containers/food/snacks/badrecipe{ @@ -90951,7 +90938,7 @@ iqE dIN dIN gJl -otM +dKK dbO dzi dzi diff --git a/code/controllers/subsystem/faction_task.dm b/code/controllers/subsystem/faction_task.dm index 82203fdef..18126693f 100644 --- a/code/controllers/subsystem/faction_task.dm +++ b/code/controllers/subsystem/faction_task.dm @@ -648,7 +648,7 @@ GLOBAL_LIST_INIT(faction_relics, list( /datum/faction_task/individual_player/heist name = "Heist" max_players = 5 - player_chance = 10 + player_chance = 5 var/datum/job/target_faction var/obj/target var/area/drop_off diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index 647827ea5..aaf1c3bbe 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -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 diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index 241669b2c..e8d5b6b27 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -1749,6 +1749,4 @@ /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) From eda743ef5c881606aed7499d440214dcfd380d6a Mon Sep 17 00:00:00 2001 From: LoveBeingAnOwl Date: Fri, 20 Dec 2024 08:18:11 -0600 Subject: [PATCH 14/20] faction task adjustment again and fixes card id --- code/controllers/subsystem/faction_task.dm | 3 +-- code/game/objects/items/cards_ids.dm | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/controllers/subsystem/faction_task.dm b/code/controllers/subsystem/faction_task.dm index 18126693f..19b529aff 100644 --- a/code/controllers/subsystem/faction_task.dm +++ b/code/controllers/subsystem/faction_task.dm @@ -648,7 +648,7 @@ GLOBAL_LIST_INIT(faction_relics, list( /datum/faction_task/individual_player/heist name = "Heist" max_players = 5 - player_chance = 5 + player_chance = 100 var/datum/job/target_faction var/obj/target var/area/drop_off @@ -659,7 +659,6 @@ GLOBAL_LIST_INIT(faction_relics, list( var/obj/item/paper/heist/heist_note = new /obj/item/paper/heist(get_turf(user)) user.equip_to_slot(heister_id, SLOT_WEAR_ID) user.put_in_inactive_hand(heist_note) -/obj/item/card/id/reno/heisters /datum/faction_task/individual_player/heist/New() ..() diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index e8d5b6b27..fb864a331 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -1749,4 +1749,7 @@ /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 From d7ef0a7ed64f58bf5327a131151cae07cccc8eb6 Mon Sep 17 00:00:00 2001 From: LoveBeingAnOwl Date: Fri, 20 Dec 2024 13:38:05 -0600 Subject: [PATCH 15/20] reverts the map file changes from main --- _maps/map_files/Reno/Reno-Surface-2.dmm | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/_maps/map_files/Reno/Reno-Surface-2.dmm b/_maps/map_files/Reno/Reno-Surface-2.dmm index 1101cd8be..53818129e 100644 --- a/_maps/map_files/Reno/Reno-Surface-2.dmm +++ b/_maps/map_files/Reno/Reno-Surface-2.dmm @@ -8748,7 +8748,10 @@ /obj/machinery/door/poddoor/preopen{ id = "penthouse_ent" }, -/obj/machinery/door/airlock/vault/heist, +/obj/machinery/door/airlock/vault{ + req_access_txt = "168"; + name = "mysterious door" + }, /turf/open/floor/plasteel/f13/vault_floor/plating, /area/f13/reno_tribal) "dKM" = ( @@ -34643,6 +34646,16 @@ /obj/structure/barricade/wooden, /turf/open/indestructible/ground/outside/desert/reno, /area/f13/reno_wasteland) +"otM" = ( +/obj/machinery/door/airlock/vault{ + req_access_txt = "168"; + name = "mysterious door" + }, +/obj/machinery/door/poddoor/preopen{ + id = "penthouse_ent" + }, +/turf/open/floor/plasteel/f13/vault_floor/plating, +/area/f13/reno_tribal) "otT" = ( /obj/structure/rack/shelf_metal, /obj/item/reagent_containers/food/snacks/badrecipe{ @@ -90938,7 +90951,7 @@ iqE dIN dIN gJl -dKK +otM dbO dzi dzi From 5f00912feccc37b8483bc1b2f21177a5c248e96c Mon Sep 17 00:00:00 2001 From: LoveBeingAnOwl Date: Fri, 20 Dec 2024 14:03:47 -0600 Subject: [PATCH 16/20] fixes the item slot stuff --- code/controllers/subsystem/faction_task.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/controllers/subsystem/faction_task.dm b/code/controllers/subsystem/faction_task.dm index dc2f32bc3..f7254730a 100644 --- a/code/controllers/subsystem/faction_task.dm +++ b/code/controllers/subsystem/faction_task.dm @@ -657,7 +657,7 @@ GLOBAL_LIST_INIT(faction_relics, list( . = ..() 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(heister_id, SLOT_WEAR_ID) + user.equip_to_slot(heister_id, ITEM_SLOT_ID) user.put_in_inactive_hand(heist_note) /datum/faction_task/individual_player/heist/New() From ba476c1a553726e9a11de6de3066596f02180f80 Mon Sep 17 00:00:00 2001 From: LoveBeingAnOwl <60655687+JustLoveBeingAnOwl@users.noreply.github.com> Date: Sat, 21 Dec 2024 09:51:41 -0600 Subject: [PATCH 17/20] Update heist probability because it was at 100 for some reason --- code/controllers/subsystem/faction_task.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/controllers/subsystem/faction_task.dm b/code/controllers/subsystem/faction_task.dm index f7254730a..51d566597 100644 --- a/code/controllers/subsystem/faction_task.dm +++ b/code/controllers/subsystem/faction_task.dm @@ -648,7 +648,7 @@ GLOBAL_LIST_INIT(faction_relics, list( /datum/faction_task/individual_player/heist name = "Heist" max_players = 5 - player_chance = 100 + player_chance = 10 var/datum/job/target_faction var/obj/target var/area/drop_off From 1d0db60956c07b5cadcf08db23cc379c3b3f26b9 Mon Sep 17 00:00:00 2001 From: LoveBeingAnOwl Date: Sun, 22 Dec 2024 06:46:46 -0600 Subject: [PATCH 18/20] brings faction_tasks.dm up to line --- code/controllers/subsystem/faction_task.dm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/code/controllers/subsystem/faction_task.dm b/code/controllers/subsystem/faction_task.dm index 51d566597..4ec309b9e 100644 --- a/code/controllers/subsystem/faction_task.dm +++ b/code/controllers/subsystem/faction_task.dm @@ -5,7 +5,7 @@ | Chance of a global task occuring is determined in the global_faction datum. | | To enable the global task for a faction, the datum path as a string should be added and | | set equal to TRUE. | -| -- Ex: "datum/job/[FACTION] = list("/datum/faction_task/global_faction/[TASKK]" = TRUE | +| -- Ex: "datum/job/[FACTION] = list("/datum/faction_task/global_faction/[TASK]" = TRUE | | | | Individual faction tasks (tasks assigned to a single faction) function the same except | | instead of setting them to true, they should be to their % chance of being chosen. | @@ -23,30 +23,30 @@ GLOBAL_LIST_INIT(faction_task_probabilities, list( "/datum/faction_task/individual_faction/assassination" = 40, "/datum/faction_task/individual_faction/recruit" = 30, "/datum/faction_task/individual_player/coupdetat" = 20 - ), + ), "/datum/job/bishops" = list( "/datum/faction_task/global_faction/wealth" = TRUE, "/datum/faction_task/individual_faction/frame" = 30, "/datum/faction_task/individual_faction/assassination" = 40, "/datum/faction_task/individual_faction/recruit" = 30, "/datum/faction_task/individual_player/coupdetat" = 20 - ), + ), "/datum/job/vangraffs" = list( "/datum/faction_task/global_faction/wealth" = TRUE, "/datum/faction_task/individual_faction/frame" = 30, "/datum/faction_task/individual_faction/assassination" = 40, "/datum/faction_task/individual_faction/recruit" = 30, "/datum/faction_task/individual_player/coupdetat" = 20 - ), + ), "/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/citizens/f13convict" = list( "/datum/faction_task/individual_player/heist" = 100, - ), + ), )) GLOBAL_DATUM_INIT(faction_task_controller, /datum/faction_task_controller, new) @@ -376,9 +376,9 @@ GLOBAL_LIST_INIT(faction_vault_areas, list( // Can be an item or object GLOBAL_LIST_INIT(faction_relics, list( - "/datum/job/bishops" = /obj/structure/closet/crate/grave/ark, \ - "/datum/job/vangraffs" = /obj/structure/closet/crate/grave/experimental_crate, \ - "/datum/job/wrights" = /obj/structure/closet/crate/grave/strangebird, \ + "/datum/job/bishops" = /obj/structure/closet/crate/mcguffin/ark, + "/datum/job/vangraffs" = /obj/structure/closet/crate/mcguffin/experimental_crate, + "/datum/job/wrights" = /obj/structure/closet/crate/mcguffin/strangebird, )) /area/f13/vangraffs_vault From 9a4cb7b811b33a25e492673ccce786ffe6466f31 Mon Sep 17 00:00:00 2001 From: LoveBeingAnOwl Date: Sun, 22 Dec 2024 06:48:58 -0600 Subject: [PATCH 19/20] okay fine i'll try pulling faction_task.dm from main --- code/controllers/subsystem/faction_task.dm | 42 +++++++--------------- 1 file changed, 13 insertions(+), 29 deletions(-) diff --git a/code/controllers/subsystem/faction_task.dm b/code/controllers/subsystem/faction_task.dm index 4ec309b9e..2bcb4f106 100644 --- a/code/controllers/subsystem/faction_task.dm +++ b/code/controllers/subsystem/faction_task.dm @@ -5,7 +5,7 @@ | Chance of a global task occuring is determined in the global_faction datum. | | To enable the global task for a faction, the datum path as a string should be added and | | set equal to TRUE. | -| -- Ex: "datum/job/[FACTION] = list("/datum/faction_task/global_faction/[TASK]" = TRUE | +| -- Ex: "datum/job/[FACTION] = list("/datum/faction_task/global_faction/[TASKK]" = TRUE | | | | Individual faction tasks (tasks assigned to a single faction) function the same except | | instead of setting them to true, they should be to their % chance of being chosen. | @@ -23,30 +23,24 @@ GLOBAL_LIST_INIT(faction_task_probabilities, list( "/datum/faction_task/individual_faction/assassination" = 40, "/datum/faction_task/individual_faction/recruit" = 30, "/datum/faction_task/individual_player/coupdetat" = 20 - ), + ), "/datum/job/bishops" = list( "/datum/faction_task/global_faction/wealth" = TRUE, "/datum/faction_task/individual_faction/frame" = 30, "/datum/faction_task/individual_faction/assassination" = 40, "/datum/faction_task/individual_faction/recruit" = 30, "/datum/faction_task/individual_player/coupdetat" = 20 - ), + ), "/datum/job/vangraffs" = list( "/datum/faction_task/global_faction/wealth" = TRUE, "/datum/faction_task/individual_faction/frame" = 30, "/datum/faction_task/individual_faction/assassination" = 40, "/datum/faction_task/individual_faction/recruit" = 30, "/datum/faction_task/individual_player/coupdetat" = 20 - ), + ), "/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/citizens/f13convict" = list( - "/datum/faction_task/individual_player/heist" = 100, - ), + ), )) GLOBAL_DATUM_INIT(faction_task_controller, /datum/faction_task_controller, new) @@ -376,9 +370,9 @@ GLOBAL_LIST_INIT(faction_vault_areas, list( // Can be an item or object GLOBAL_LIST_INIT(faction_relics, list( - "/datum/job/bishops" = /obj/structure/closet/crate/mcguffin/ark, - "/datum/job/vangraffs" = /obj/structure/closet/crate/mcguffin/experimental_crate, - "/datum/job/wrights" = /obj/structure/closet/crate/mcguffin/strangebird, + "/datum/job/bishops" = /obj/structure/closet/crate/grave/ark, \ + "/datum/job/vangraffs" = /obj/structure/closet/crate/grave/experimental_crate, \ + "/datum/job/wrights" = /obj/structure/closet/crate/grave/strangebird, \ )) /area/f13/vangraffs_vault @@ -568,7 +562,7 @@ GLOBAL_LIST_INIT(faction_relics, list( ..() var/obj/item/storage/box/recruit_forms/forms = new(get_turf(user)) forms.set_task(src) - user.equip_to_slot_if_possible(forms, ITEM_SLOT_BACKPACK) + user.equip_to_slot_if_possible(forms, SLOT_IN_BACKPACK) /datum/faction_task/individual_faction/recruit/calculate_score() if(recruits >= recruit_target) @@ -648,18 +642,11 @@ GLOBAL_LIST_INIT(faction_relics, list( /datum/faction_task/individual_player/heist name = "Heist" max_players = 5 - player_chance = 10 + player_chance = 75 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(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) @@ -672,12 +659,6 @@ GLOBAL_LIST_INIT(faction_relics, list( /datum/faction_task/individual_player/heist/calculate_score() var/turf/T = get_turf(target) if(target && istype(T.loc, drop_off)) - - - - - - return TRUE return FALSE @@ -690,6 +671,9 @@ GLOBAL_LIST_INIT(faction_relics, list( else return "The heist failed." + + + /////////////////// /* Miscellaneous */ /////////////////// From 0abff5b8467022fe66d2e6e4a02c90c42cb74b02 Mon Sep 17 00:00:00 2001 From: LoveBeingAnOwl Date: Sun, 22 Dec 2024 07:08:41 -0600 Subject: [PATCH 20/20] faction_task.dm updated once more --- code/controllers/subsystem/faction_task.dm | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/code/controllers/subsystem/faction_task.dm b/code/controllers/subsystem/faction_task.dm index acfb242fd..e14d80046 100644 --- a/code/controllers/subsystem/faction_task.dm +++ b/code/controllers/subsystem/faction_task.dm @@ -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) @@ -562,7 +568,7 @@ GLOBAL_LIST_INIT(faction_relics, list( ..() var/obj/item/storage/box/recruit_forms/forms = new(get_turf(user)) forms.set_task(src) - user.equip_to_slot_if_possible(forms, SLOT_IN_BACKPACK) + user.equip_to_slot_if_possible(forms, ITEM_SLOT_BACKPACK) /datum/faction_task/individual_faction/recruit/calculate_score() if(recruits >= recruit_target) @@ -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)