mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-20 12:35:33 +01:00
Change injectors on research gateway, and remove the free magic books, remove 'unsalvageable' gateway maps (#66161)
* Replace genetics stuff on research, remove the stupid wizard thing * Remove 'unsalvageable' away missions * Remove artillery thing
This commit is contained in:
Mothblocks
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -2131,7 +2131,6 @@
|
||||
read_only = 1
|
||||
},
|
||||
/obj/item/firing_pin/dna,
|
||||
/obj/item/dnainjector/hulkmut,
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/awaymission/research/interior/secure)
|
||||
"hZ" = (
|
||||
@@ -2190,8 +2189,7 @@
|
||||
},
|
||||
/obj/item/firing_pin/dna/dredd,
|
||||
/obj/item/firing_pin/dna/dredd,
|
||||
/obj/item/dnainjector/lasereyesmut,
|
||||
/obj/item/dnainjector/lasereyesmut,
|
||||
/obj/item/dnainjector/insulated,
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/awaymission/research/interior/secure)
|
||||
"io" = (
|
||||
@@ -3593,24 +3591,32 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/research/interior/escapepods)
|
||||
"na" = (
|
||||
/turf/closed/wall/mineral/plasma,
|
||||
/area/space/nearstation)
|
||||
/obj/structure/closet/crate,
|
||||
/obj/item/disk/data{
|
||||
desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, information will turn up blank on most DNA machines.";
|
||||
name = "encrypted genetic data disk";
|
||||
read_only = 1
|
||||
},
|
||||
/obj/item/disk/data{
|
||||
desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, information will turn up blank on most DNA machines.";
|
||||
name = "encrypted genetic data disk";
|
||||
read_only = 1
|
||||
},
|
||||
/obj/item/firing_pin/dna,
|
||||
/obj/item/dnainjector/thermal,
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/awaymission/research/interior/secure)
|
||||
"nb" = (
|
||||
/obj/structure/table/wood,
|
||||
/obj/item/book/granter/spell/random,
|
||||
/turf/open/floor/mineral/plasma,
|
||||
/area/space/nearstation)
|
||||
"nc" = (
|
||||
/mob/living/simple_animal/hostile/netherworld,
|
||||
/turf/open/floor/mineral/plasma,
|
||||
/area/space/nearstation)
|
||||
"nd" = (
|
||||
/obj/structure/healingfountain,
|
||||
/turf/open/floor/mineral/plasma,
|
||||
/area/space/nearstation)
|
||||
"ne" = (
|
||||
/turf/open/floor/mineral/plasma,
|
||||
/area/space/nearstation)
|
||||
/obj/structure/closet/crate,
|
||||
/obj/item/disk/data{
|
||||
desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, information will turn up blank on most DNA machines.";
|
||||
name = "encrypted genetic data disk";
|
||||
read_only = 1
|
||||
},
|
||||
/obj/item/firing_pin/dna,
|
||||
/obj/item/dnainjector/telemut,
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/awaymission/research/interior/secure)
|
||||
"nf" = (
|
||||
/turf/closed/wall/mineral/plastitanium/nodiagonal,
|
||||
/area/awaymission/research/interior/engineering)
|
||||
@@ -9039,11 +9045,11 @@ ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
na
|
||||
na
|
||||
na
|
||||
na
|
||||
na
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
@@ -9296,11 +9302,11 @@ ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
na
|
||||
nb
|
||||
nb
|
||||
nb
|
||||
na
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
@@ -9553,11 +9559,11 @@ ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
na
|
||||
nc
|
||||
ne
|
||||
nc
|
||||
na
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
@@ -9810,11 +9816,11 @@ ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
na
|
||||
nd
|
||||
ne
|
||||
nd
|
||||
na
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
@@ -10067,11 +10073,11 @@ ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
na
|
||||
na
|
||||
ne
|
||||
na
|
||||
na
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
@@ -10325,9 +10331,9 @@ ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
na
|
||||
ne
|
||||
na
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
@@ -10581,10 +10587,10 @@ ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
na
|
||||
na
|
||||
ne
|
||||
na
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
@@ -10838,10 +10844,10 @@ ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
na
|
||||
ne
|
||||
ne
|
||||
na
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
@@ -11095,10 +11101,10 @@ ab
|
||||
ab
|
||||
ab
|
||||
aa
|
||||
na
|
||||
na
|
||||
na
|
||||
na
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
ab
|
||||
ab
|
||||
ab
|
||||
@@ -30588,8 +30594,8 @@ eW
|
||||
dc
|
||||
cQ
|
||||
hT
|
||||
hT
|
||||
dd
|
||||
na
|
||||
nb
|
||||
cQ
|
||||
ad
|
||||
ad
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,58 +0,0 @@
|
||||
|
||||
|
||||
/obj/machinery/artillerycontrol
|
||||
var/reload = 120
|
||||
var/reload_cooldown = 120
|
||||
var/explosiondev = 3
|
||||
var/explosionmed = 6
|
||||
var/explosionlight = 12
|
||||
name = "bluespace artillery control"
|
||||
icon_state = "control_boxp1"
|
||||
icon = 'icons/obj/machines/particle_accelerator.dmi'
|
||||
density = TRUE
|
||||
|
||||
/obj/machinery/artillerycontrol/process(delta_time)
|
||||
if(reload < reload_cooldown)
|
||||
reload += delta_time
|
||||
|
||||
/obj/structure/artilleryplaceholder
|
||||
name = "artillery"
|
||||
icon = 'icons/obj/machines/artillery.dmi'
|
||||
anchored = TRUE
|
||||
density = TRUE
|
||||
|
||||
/obj/structure/artilleryplaceholder/decorative
|
||||
density = FALSE
|
||||
|
||||
/obj/machinery/artillerycontrol/ui_interact(mob/user)
|
||||
. = ..()
|
||||
var/dat = "<B>Bluespace Artillery Control:</B><BR>"
|
||||
dat += "Locked on<BR>"
|
||||
dat += "<B>Charge progress: [reload]/[reload_cooldown]:</B><BR>"
|
||||
dat += "<A href='byond://?src=[REF(src)];fire=1'>Open Fire</A><BR>"
|
||||
dat += "Deployment of weapon authorized by <br>Nanotrasen Naval Command<br><br>Remember, friendly fire is grounds for termination of your contract and life.<HR>"
|
||||
user << browse(dat, "window=scroll")
|
||||
onclose(user, "scroll")
|
||||
|
||||
/obj/machinery/artillerycontrol/Topic(href, href_list)
|
||||
if(..())
|
||||
return
|
||||
var/target_area = tgui_input_list(usr, "Area to bombard", "Open Fire", GLOB.teleportlocs)
|
||||
if(isnull(target_area))
|
||||
return
|
||||
if(isnull(GLOB.teleportlocs[target_area]))
|
||||
return
|
||||
var/area/thearea = GLOB.teleportlocs[target_area]
|
||||
if(usr.stat != CONSCIOUS || HAS_TRAIT(usr, TRAIT_HANDS_BLOCKED))
|
||||
return
|
||||
if(reload < reload_cooldown)
|
||||
return
|
||||
if(usr.contents.Find(src) || (in_range(src, usr) && isturf(loc)) || issilicon(usr))
|
||||
priority_announce("Bluespace artillery fire detected. Brace for impact.")
|
||||
message_admins("[ADMIN_LOOKUPFLW(usr)] has launched an artillery strike.")
|
||||
var/list/possible_turfs = list()
|
||||
for(var/turf/available_turf in get_area_turfs(thearea.type))
|
||||
possible_turfs += available_turf
|
||||
var/random_turf = pick(possible_turfs)
|
||||
explosion(random_turf, explosiondev, explosionmed, explosionlight, explosion_cause = src)
|
||||
reload = 0
|
||||
@@ -8,11 +8,7 @@
|
||||
#DO tick the associated code file for the away mission you are enabling. Otherwise, the map will be trying to reference objects which do not exist, which will cause runtime errors!
|
||||
|
||||
#_maps/RandomZLevels/blackmarketpackers.dmm
|
||||
#_maps/RandomZLevels/spacebattle.dmm
|
||||
#_maps/RandomZLevels/TheBeach.dmm
|
||||
#_maps/RandomZLevels/Academy.dmm
|
||||
#_maps/RandomZLevels/wildwest.dmm
|
||||
#_maps/RandomZLevels/challenge.dmm
|
||||
#_maps/RandomZLevels/centcomAway.dmm
|
||||
#_maps/RandomZLevels/moonoutpost19.dmm
|
||||
#_maps/RandomZLevels/undergroundoutpost45.dmm
|
||||
@@ -20,4 +16,4 @@
|
||||
#_maps/RandomZLevels/snowdin.dmm
|
||||
#_maps/RandomZLevels/research.dmm
|
||||
#_maps/RandomZLevels/SnowCabin.dmm
|
||||
_maps/RandomZLevels/VR/snowdin_VR.dmm
|
||||
_maps/RandomZLevels/VR/snowdin_VR.dmm
|
||||
|
||||
@@ -2331,7 +2331,6 @@
|
||||
#include "code\modules\autowiki\pages\techweb.dm"
|
||||
#include "code\modules\autowiki\pages\vending.dm"
|
||||
#include "code\modules\awaymissions\away_props.dm"
|
||||
#include "code\modules\awaymissions\bluespaceartillery.dm"
|
||||
#include "code\modules\awaymissions\cordon.dm"
|
||||
#include "code\modules\awaymissions\exile.dm"
|
||||
#include "code\modules\awaymissions\gateway.dm"
|
||||
|
||||
Reference in New Issue
Block a user