cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-13 16:13:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Beacons are no longer radios (#25559)

Browse Source 
* lets goooo

* name change

* yes

* dgamer review

* Update code/modules/projectiles/projectile/special_projectiles.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

---------

Signed-off-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
This commit is contained in:
Contrabang
2024-06-12 14:00:08 -04:00
committed by GitHub
parent 77d83ef1b9
commit 7df5e186a0
27 changed files with 112 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/equipment/wormhole_jaunter.dm
+4 -4
View File
@@ -25,7 +25,7 @@
/obj/item/wormhole_jaunter/proc/get_destinations(mob/user)
var/list/destinations = list()
for(var/obj/item/radio/beacon/B in GLOB.global_radios)
for(var/obj/item/beacon/B in GLOB.beacons)
var/turf/T = get_turf(B)
if(is_station_level(T.z))
destinations += B
@@ -109,7 +109,7 @@
var/list/L = list()
var/list/areaindex = list()
for(var/obj/item/radio/beacon/R in GLOB.beacons)
for(var/obj/item/beacon/R in GLOB.beacons)
var/turf/T = get_turf(R)
if(!T)
continue
@@ -162,7 +162,7 @@
/obj/item/storage/box/syndie_kit/escape_flare/populate_contents()
new /obj/item/wormhole_jaunter/contractor(src)
new /obj/item/radio/beacon/emagged(src)
new /obj/item/beacon/emagged(src)
/obj/effect/portal/advanced/getaway
one_use = TRUE
@@ -197,7 +197,7 @@
/obj/item/grenade/jaunter_grenade/prime()
update_mob()
var/list/destinations = list()
for(var/obj/item/radio/beacon/B in GLOB.global_radios)
for(var/obj/item/beacon/B in GLOB.beacons)
var/turf/BT = get_turf(B)
if(is_station_level(BT.z))
destinations += BT
code/modules/mining/machine_vending.dm
+4 -4
View File
@@ -399,7 +399,7 @@
EQUIPMENT ("Robust Treasure Satchel", /obj/item/storage/bag/expedition/robust, 300),
EQUIPMENT("Tracking Bio-chip Kit", /obj/item/storage/box/minertracker, 600),
EQUIPMENT("Telecommunications Relay Kit", /obj/item/storage/box/relay_kit, 500),
EQUIPMENT("Tracking Beacon", /obj/item/radio/beacon, 200),
EQUIPMENT("Tracking Beacon", /obj/item/beacon, 200),
)
prize_list["Modsuits"] = list(
EQUIPMENT("Standard MODsuit", /obj/item/mod/control/pre_equipped/standard/explorer, 1000),
@@ -410,7 +410,7 @@
EQUIPMENT("Mining MODsuit", /obj/item/mod/control/pre_equipped/mining/vendor, 3500),
EQUIPMENT("Asteroid MODsuit Skin", /obj/item/mod/skin_applier/asteroid, 1000),
)
prize_list["Consumables"] = list(
EQUIPMENT("First-Aid Kit", /obj/item/storage/firstaid/regular, 400),
EQUIPMENT("Advanced First-Aid Kit", /obj/item/storage/firstaid/adv, 600),
@@ -418,7 +418,7 @@
EQUIPMENT("Point Transfer Card", /obj/item/card/mining_point_card, 500),
EQUIPMENT("Stabilizing Serum", /obj/item/hivelordstabilizer, 400),
)
prize_list["Kinetic Accelerator"] = list(
EQUIPMENT("Kinetic Pistol", /obj/item/gun/energy/kinetic_accelerator/pistol, 750),
EQUIPMENT("KA Adjustable Tracer Rounds", /obj/item/borg/upgrade/modkit/tracer/adjustable, 150),
@@ -430,7 +430,7 @@
EQUIPMENT("KA Super Chassis", /obj/item/borg/upgrade/modkit/chassis_mod, 250),
EQUIPMENT("KA White Tracer Rounds", /obj/item/borg/upgrade/modkit/tracer, 100),
)
prize_list["Miscellaneous"] = list(
EQUIPMENT("Alien Toy", /obj/item/clothing/mask/facehugger/toy, 300),
EQUIPMENT("Toy Sword", /obj/item/toy/sword, 200),