mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-15 09:03:23 +01:00
Beacons are no longer radios (#25559)
* 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:
@@ -234,14 +234,14 @@
|
||||
desc = "It tastes a little odd but it's still delicious."
|
||||
icon = 'icons/obj/food/meat.dmi'
|
||||
icon_state = "bacon"
|
||||
var/obj/item/radio/beacon/bacon/baconbeacon
|
||||
var/obj/item/beacon/bacon/baconbeacon
|
||||
list_reagents = list("nutriment" = 4, "porktonium" = 10)
|
||||
tastes = list("bacon" = 1)
|
||||
goal_difficulty = FOOD_GOAL_NORMAL
|
||||
|
||||
/obj/item/food/snacks/telebacon/Initialize(mapload)
|
||||
. = ..()
|
||||
baconbeacon = new /obj/item/radio/beacon/bacon(src)
|
||||
baconbeacon = new /obj/item/beacon/bacon(src)
|
||||
|
||||
/obj/item/food/snacks/telebacon/Destroy()
|
||||
QDEL_NULL(baconbeacon)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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),
|
||||
|
||||
@@ -18,7 +18,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)
|
||||
var/turf/M = get_turf(user)
|
||||
if(!T)
|
||||
|
||||
@@ -290,7 +290,7 @@
|
||||
damage = 0
|
||||
nodamage = 1
|
||||
alwayslog = TRUE
|
||||
var/obj/item/radio/beacon/teleport_target = null
|
||||
var/obj/item/beacon/teleport_target
|
||||
|
||||
/obj/item/projectile/energy/teleport/New(loc, tele_target)
|
||||
..(loc)
|
||||
|
||||
@@ -78,7 +78,7 @@
|
||||
req_tech = list("bluespace" = 1)
|
||||
build_type = PROTOLATHE
|
||||
materials = list(MAT_METAL = 300, MAT_GLASS = 200)
|
||||
build_path = /obj/item/radio/beacon
|
||||
build_path = /obj/item/beacon
|
||||
category = list("Bluespace")
|
||||
|
||||
/datum/design/brpd
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
/obj/item/disk/nuclear,
|
||||
/obj/machinery/nuclearbomb),
|
||||
"homing beacons" = list(
|
||||
/obj/item/radio/beacon,
|
||||
/obj/item/beacon,
|
||||
/obj/machinery/quantumpad,
|
||||
/obj/machinery/teleport/station,
|
||||
/obj/machinery/teleport/hub,
|
||||
|
||||
Reference in New Issue
Block a user