Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit 8a569b9

Browse files
committed
ok this should work
1 parent 69a462e commit 8a569b9

File tree

5 files changed

+74
-16
lines changed

5 files changed

+74
-16
lines changed

code/controllers/subsystem/backrooms.dm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ SUBSYSTEM_DEF(backrooms)
88

99
//associative list of objects and how much they sell for
1010
var/list/golden_loot = list(
11-
/obj/item/statuebust = 1000,
12-
/obj/item/reagent_containers/food/snacks/urinalcake = 1000,
11+
/obj/item/statuebust = 2000,
12+
/obj/item/reagent_containers/food/snacks/urinalcake = 2000,
1313
/obj/item/bigspoon = 4000,
1414
/obj/item/reagent_containers/food/snacks/burger/rat = 1200,
1515
/obj/item/extinguisher = 2500,
16-
/obj/item/toy/plush/lizard/azeel = 5000
16+
/obj/item/toy/plush/lizard/azeel = 10000
1717
)
1818

1919
/datum/controller/subsystem/backrooms/Initialize(timeofday)

code/datums/mapgen/dungeon_generators/maintenance_generator/maintenance_room_themes/random.dm

Lines changed: 30 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
list(/obj/structure/table, /obj/item/reagent_containers/glass/bottle/nutrient/ez, /obj/item/reagent_containers/glass/bottle/nutrient/rh) = 1,
1515
list(/obj/structure/table, /obj/item/cultivator, /obj/item/hatchet) = 1,
1616
/obj/item/reagent_containers/glass/bottle/ammonia = 1,
17-
/obj/item/reagent_containers/glass/bottle/diethylamine = 1,
17+
/obj/item/reagent_containers/glass/bottle/diethylamine = 1
1818
)
1919

2020
weighted_mob_spawn_list = list(
@@ -42,6 +42,7 @@
4242
/obj/machinery/power/port_gen/pacman = 1,
4343
/obj/structure/frame/machine = 2,
4444
/obj/structure/frame/computer = 1,
45+
/obj/effect/spawner/lootdrop/nullspace_crystal_spawner = 1
4546
)
4647

4748
/datum/dungeon_room_theme/maintenance/material_storeroom/pre_initialize()
@@ -103,6 +104,7 @@
103104
/mob/living/simple_animal/mouse = 3,
104105
/mob/living/simple_animal/opossum = 1,
105106
/mob/living/simple_animal/hostile/retaliate/goat = 1,
107+
/obj/effect/spawner/lootdrop/nullspace_crystal_spawner
106108
)
107109

108110
/datum/dungeon_room_theme/maintenance/junk/pre_initialize()
@@ -128,6 +130,7 @@
128130
/obj/machinery/iv_drip = 2,
129131
/obj/machinery/stasis = 1,
130132
/obj/machinery/sleeper = 1,
133+
/obj/effect/spawner/lootdrop/nullspace_crystal_spawner = 1
131134
)
132135
weighted_mob_spawn_list = list(
133136
/mob/living/simple_animal/hostile/zombie = 3,
@@ -179,6 +182,7 @@
179182
/obj/item/weldingtool/largetank = 1,
180183
/obj/structure/frame/machine = 1,
181184
/obj/structure/frame/computer = 1,
185+
/obj/effect/spawner/lootdrop/nullspace_crystal_spawner = 1
182186
)
183187
weighted_mob_spawn_list = list(
184188
/mob/living/simple_animal/hostile/hivebot = 5,
@@ -210,6 +214,7 @@
210214
/obj/structure/spider/stickyweb = 5,
211215
/obj/structure/spider/cocoon = 5,
212216
/obj/structure/spider/spiderling = 2,
217+
/obj/effect/spawner/lootdrop/nullspace_crystal_spawner = 1
213218
)
214219

215220
weighted_mob_spawn_list = list(
@@ -233,6 +238,7 @@
233238
list(/obj/structure/table, /obj/item/reagent_containers/glass/beaker/waterbottle, /obj/item/reagent_containers/food/snacks/monkeycube) = 1,
234239
/obj/structure/frame/machine = 1,
235240
/obj/structure/frame/computer = 1,
241+
/obj/effect/spawner/lootdrop/nullspace_crystal_spawner = 1
236242
)
237243

238244
weighted_mob_spawn_list = list(
@@ -274,7 +280,8 @@
274280
/obj/structure/frame/machine = 3,
275281
/obj/structure/frame/computer = 2,
276282
/obj/effect/spawner/lootdrop/random_anomaly_core = 1,
277-
/obj/effect/mine/stun
283+
/obj/effect/mine/stun = 1,
284+
/obj/effect/spawner/lootdrop/nullspace_crystal_spawner = 1
278285
)
279286
weighted_mob_spawn_list = list(
280287
/mob/living/simple_animal/hostile/hivebot = 5,
@@ -304,7 +311,8 @@
304311
/obj/item/coin/silver = 5,
305312
/obj/item/stack/sheet/mineral/gold = 10, ///this DLC is about letting go, letting go of poverty!!!
306313
/obj/item/stack/spacecash/c1000 = 2,
307-
/obj/item/stack/sheet/mineral/diamond = 5
314+
/obj/item/stack/sheet/mineral/diamond = 5,
315+
/obj/effect/spawner/lootdrop/nullspace_crystal_spawner = 1
308316
)
309317
weighted_mob_spawn_list = list(
310318
/mob/living/simple_animal/hostile/hivebot/range = 2,
@@ -318,7 +326,8 @@
318326
/obj/structure/closet/secure_closet/freezer/fridge = 1,
319327
/obj/item/storage/box/donkpockets = 1,
320328
/obj/item/kitchen/knife = 1,
321-
/obj/effect/spawner/lootdrop/random_meat = 5
329+
/obj/effect/spawner/lootdrop/random_meat = 5,
330+
/obj/effect/spawner/lootdrop/nullspace_crystal_spawner = 1
322331

323332
)
324333
weighted_mob_spawn_list = list(
@@ -340,7 +349,8 @@
340349
list(/obj/structure/rack , /obj/item/clothing/suit/armor/vest, /obj/item/clothing/head/helmet/riot) = 1,
341350
/obj/structure/frame/machine = 1,
342351
/obj/structure/frame/computer = 1,
343-
/obj/effect/mine/stun
352+
/obj/effect/mine/stun,
353+
/obj/effect/spawner/lootdrop/nullspace_crystal_spawner = 1
344354
)
345355

346356
weighted_mob_spawn_list = list(
@@ -381,7 +391,7 @@
381391
. = ..()
382392
for(var/i in 1 to 5)
383393
if(prob(10))
384-
weighted_feature_spawn_list[/obj/item/gun/energy/laser/captain/scattershot ]++
394+
weighted_feature_spawn_list[/obj/item/gun/energy/laser/captain/scattershot]++
385395
else
386396
weighted_feature_spawn_list[/obj/item/melee/spear/bonespear/chitinspear]++
387397

@@ -393,7 +403,8 @@
393403
/obj/machinery/autolathe = 1,
394404
/obj/item/stack/sheet/glass/fifty = 1,
395405
/obj/item/stack/sheet/metal/fifty = 1,
396-
/obj/item/stack/sheet/mineral/silver/fifty = 1
406+
/obj/item/stack/sheet/mineral/silver/fifty = 1,
407+
/obj/effect/spawner/lootdrop/nullspace_crystal_spawner = 1
397408
)
398409
///eskimo enemy variety, they came here for the winter
399410
/datum/dungeon_room_theme/maintenance/eskimo
@@ -413,7 +424,8 @@
413424
weighted_feature_spawn_list = list(
414425
/obj/effect/mine/kickmine = 1,
415426
/obj/effect/mine/creampie = 7,
416-
/obj/effect/spawner/lootdrop/random_anomaly_core = 1
427+
/obj/effect/spawner/lootdrop/random_anomaly_core = 1,
428+
/obj/effect/spawner/lootdrop/nullspace_crystal_spawner = 1
417429
)
418430
///mineral room 2 but with danger involved
419431
/datum/dungeon_room_theme/maintenance/mineral_room
@@ -423,7 +435,8 @@
423435
/obj/item/stack/sheet/mineral/plasma = 5,
424436
/obj/item/stack/sheet/mineral/gold = 5,
425437
/obj/item/stack/sheet/mineral/silver = 5,
426-
/obj/item/stack/sheet/mineral/mythril = 1
438+
/obj/item/stack/sheet/mineral/mythril = 1,
439+
/obj/effect/spawner/lootdrop/nullspace_crystal_spawner = 1
427440
)
428441

429442
weighted_mob_spawn_list = list(
@@ -435,7 +448,8 @@
435448
weighted_feature_spawn_list = list(
436449
/obj/item/clothing/gloves/combat = 1,
437450
/obj/item/kitchen/knife/combat = 1,
438-
/obj/machinery/atmospherics/components/unary/vent_pump/on = 1
451+
/obj/machinery/atmospherics/components/unary/vent_pump/on = 1,
452+
/obj/effect/spawner/lootdrop/nullspace_crystal_spawner = 1
439453
)
440454

441455

@@ -449,7 +463,8 @@
449463
/obj/item/reagent_containers/food/snacks/pizza = 1,
450464
/obj/item/circuitboard/machine/griddle = 1,
451465
/obj/item/clothing/suit/toggle/chef = 1,
452-
/obj/item/clothing/suit/apron/chef = 1
466+
/obj/item/clothing/suit/apron/chef = 1,
467+
/obj/effect/spawner/lootdrop/nullspace_crystal_spawner = 1
453468
)
454469
///cuackles played this once
455470
/datum/dungeon_room_theme/maintenance/oxygen_included
@@ -458,19 +473,21 @@
458473
/obj/structure/tank_dispenser = 1,
459474
/obj/item/tank/internals/emergency_oxygen = 3,
460475
/obj/item/tank/internals/emergency_oxygen/double = 1,
461-
/obj/item/tank/internals/emergency_oxygen/vox = 1
476+
/obj/item/tank/internals/emergency_oxygen/vox = 1,
477+
/obj/effect/spawner/lootdrop/nullspace_crystal_spawner = 1
462478
)
463479
///we couldnt afford the surgery tools
464480
/datum/dungeon_room_theme/maintenance/medical_surgical
465481
weighted_possible_floor_types = list(
466482
/turf/open/floor/plasteel/white = 3,
467483
/turf/open/floor/plasteel = 5,
468-
/turf/open/floor/plating = 3,
484+
/turf/open/floor/plating = 3,
469485
)
470486

471487
weighted_feature_spawn_list = list(
472488
/obj/item/storage/firstaid/regular = 1,
473489
/obj/item/storage/firstaid/toxin = 1,
474490
/obj/machinery/computer/operating = 1,
475491
/obj/structure/table/optable = 1,
492+
/obj/effect/spawner/lootdrop/nullspace_crystal_spawner = 1
476493
)

icons/obj/telescience.dmi

253 Bytes
Binary file not shown.

yogstation.dme

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4235,6 +4235,7 @@
42354235
#include "yogstation\code\game\objects\items\robot\robot_parts.dm"
42364236
#include "yogstation\code\game\objects\items\stacks\dilithiumcrystal.dm"
42374237
#include "yogstation\code\game\objects\items\stacks\sheets\leather.dm"
4238+
#include "yogstation\code\game\objects\items\stacks\sheets\nullspace_crystals.dm"
42384239
#include "yogstation\code\game\objects\items\stacks\tiles\tile_types.dm"
42394240
#include "yogstation\code\game\objects\items\storage\backpack.dm"
42404241
#include "yogstation\code\game\objects\items\storage\bags.dm"
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
/obj/item/nullspace_crystal
2+
name = "dull nullspace crystal"
3+
desc = "a pitch black crystal, found in the space between red and blue. This one looks particularly dull."
4+
icon = 'icons/obj/telescience.dmi'
5+
icon_state = "nullspace_crystal"
6+
///how much nullspace dust does each crystal give when used on the psionic awakener
7+
var/dust = 5
8+
9+
/obj/item/nullspace_crystal/afterattack(obj/machinery/I, mob/user, proximity)
10+
. = ..()
11+
if(istype(I, /obj/machinery/psionic_awakener))
12+
var/obj/machinery/psionic_awakener/cart = I
13+
cart.nullspace_dust += dust
14+
to_chat(user, span_notice("You force the nullspace crystal into the psionic awakener's crystal port, you can hear a soft grinding sound."))
15+
qdel(src)
16+
17+
/obj/item/nullspace_crystal/brilliant
18+
name = "brilliant nullspace crystal"
19+
desc = "a slightly less pitch black crystal, found in the space between red and blue. This one looks particularly brilliant."
20+
dust = 10
21+
22+
/obj/item/nullspace_crystal/prismatic
23+
name = "prismatic nullspace crystal"
24+
desc = "an oddly black crystal, found in the space between red and blue. This one looks particularly prismatic. You know what that means right?"
25+
dust = 25
26+
27+
/obj/item/nullspace_crystal/true
28+
name = "true nullspace crystal"
29+
desc = "a crystal made of pure condensed nullspace, looking through it is like a kaleidoscope, with different versions of you looking back."
30+
dust = 100
31+
32+
/obj/effect/spawner/lootdrop/nullspace_crystal_spawner
33+
name = "nullspace crystal spawner"
34+
lootdoubles = FALSE
35+
36+
loot = list(
37+
/obj/item/nullspace_crystal = 75,
38+
/obj/item/nullspace_crystal/brilliant = 20,
39+
/obj/item/nullspace_crystal/prismatic = 4,
40+
/obj/item/nullspace_crystal/true = 1)

0 commit comments

Comments
 (0)