Skip to content

Commit

Permalink
dear god
Browse files Browse the repository at this point in the history
  • Loading branch information
Domic2 committed Jul 15, 2020
1 parent ce4ed9e commit 22f6c45
Show file tree
Hide file tree
Showing 19 changed files with 956 additions and 392 deletions.
531 changes: 309 additions & 222 deletions maps/perseverance/Perseverance_1.dmm

Large diffs are not rendered by default.

317 changes: 196 additions & 121 deletions maps/perseverance/Perseverance_2.dmm

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions maps/perseverance/XIV.dm
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
#include "code/XIV_clothes.dm"
#include "code/XIV_atmos.dm"
#include "code/XIV_vent.dm"
#include "code/XIV_blackbox.dm"
#include "code/XIV_radiomodified.dm"

#include "Perseverance_1.dmm"
#include "Perseverance_2.dmm"
Expand Down
21 changes: 17 additions & 4 deletions maps/perseverance/XIV_areas.dm
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,11 @@
icon_state = "storage"
sound_env = SMALL_ENCLOSED

/area/ship/perseverance/cpod
name = "\improper Perseverance Cargo Pod"
icon_state = "shuttle"
sound_env = SMALL_ENCLOSED

//cargo bay

/area/ship/perseverance/cargobay/fore
Expand Down Expand Up @@ -113,19 +118,27 @@
/area/ship/perseverance/hall/chall
name = "\improper Perseverance Central Hallway"
icon_state = "hallC3"
sound_env = SMALL_ENCLOSED
sound_env = LARGE_ENCLOSED

/area/ship/perseverance/hall/phall
name = "\improper Perseverance Port Hallway"
icon_state = "hallF"
sound_env = SMALL_ENCLOSED
sound_env = LARGE_ENCLOSED

/area/ship/perseverance/hall/shall
name = "\improper Perseverance Starboard Hallway"
icon_state = "hallA"
sound_env = SMALL_ENCLOSED
sound_env = LARGE_ENCLOSED

/area/ship/perseverance/hall/ehall
name = "\improper Perseverance Aft Hallway"
icon_state = "hallC3"
sound_env = SMALL_ENCLOSED
sound_env = LARGE_ENCLOSED

/area/ship/perseverance/hall/ehall/port
name = "\improper Perseverance Port Aft Hallway"
icon_state = "hallF"

/area/ship/perseverance/hall/ehall/starboard
name = "\improper Perseverance Starboard Aft Hallway"
icon_state = "hallA"
4 changes: 2 additions & 2 deletions maps/perseverance/XIV_define.dm
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
salary_modifier = 0.4


//Images 2-5 are from starsector, image 1 I have no idea, couldn't really find the original author, just a lot of very different names :I
lobby_screens = list('maps/perseverance/lobby/Menu1.png', 'maps/perseverance/lobby/Menu2.jpg', 'maps/perseverance/lobby/Menu3.jpg', 'maps/perseverance/lobby/Menu4.jpg', 'maps/perseverance/lobby/Menu5.jpg')
//Images 2-4 are from starsector, image 1 I have no idea, couldn't really find who made it :I
lobby_screens = list('maps/perseverance/lobby/Menu1.png', 'maps/perseverance/lobby/Menu2.jpg', 'maps/perseverance/lobby/Menu3.jpg', 'maps/perseverance/lobby/Menu4.jpg')
lobby_tracks = list(
/music_track/torch,
/music_track/human,
Expand Down
120 changes: 120 additions & 0 deletions maps/perseverance/code/XIV_blackbox.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
#define STATION_Z 2
#define TELECOMM_Z 1

/obj/machinery/telecomms/server/blackbox
name = "Blackbox"
icon = 'maps/perseverance/icons/obj/blackbox.dmi'
icon_state = "blackbox"
desc = "A sturdy machine which utilizes phoron to record subspace data without needing power, with a delay. It has been modified to interface with modern computers."
id = "Blackbox"
network = "Blackbox"
integrity = 10000 //I did say it was sturdy
density = 1
anchored = 1
idle_power_usage = 0
machinetype = 4
circuitboard = /obj/item/weapon/stock_parts/circuitboard/telecomms/server
base_type = /obj/machinery/telecomms/server/blackbox
New()
for(var/i = PUBLIC_LOW_FREQ, i < PUBLIC_HIGH_FREQ, i += 2)
freq_listening |= i
..()

/obj/machinery/telecomms/attackby(obj/item/P as obj, mob/user as mob)

if(isWrench(P))
if(anchored == 1)
user.visible_message("[user] begins unwrenching the anchoring bolts on [src].", "You begin unwrenching the anchoring bolts...")
else
user.visible_message("[user] begins wrenching the anchoring bolts on [src].", "You begin wrenching the anchoring bolts...")
if(do_after(user, 50, src))
if(!src || !user) return
if(anchored == 1)
user.visible_message("[user] unwrenches the anchoring bolts on [src].", "You unwrench the anchoring bolts.")
anchored = 0
else
user.visible_message("[user] wrenches the anchoring bolts on [src].", "You wrench the anchoring bolts.")
anchored = 1

/obj/machinery/telecomms/server/blackbox/receive_signal(datum/signal/signal, obj/machinery/telecomms/machine_from)

sleep (400)

signal.data["compression"] = 0

// channel tag the signal
var/list/data = get_channel_info(signal.frequency)
signal.data["channel_tag"] = data[1]
signal.data["channel_color"] = data[2]

//Is this a test signal? Bypass logging
if(signal.data["type"] != 4)

// If signal has a message and appropriate frequency

var/datum/comm_log_entry/log = new
var/mob/M = signal.data["mob"]

// Copy the signal.data entries we want
log.parameters["mobtype"] = signal.data["mobtype"]
log.parameters["job"] = signal.data["job"]
log.parameters["key"] = signal.data["key"]
log.parameters["vmessage"] = signal.data["message"]
log.parameters["vname"] = signal.data["vname"]
log.parameters["message"] = signal.data["message"]
log.parameters["name"] = signal.data["name"]
log.parameters["realname"] = signal.data["realname"]
log.parameters["language"] = signal.data["language"]

var/race = "Unknown"
if(ishuman(M) || isbrain(M))
race = "Sapient Race"
log.parameters["intelligible"] = 1
else if(M.isMonkey())
race = "Monkey"
else if(issilicon(M))
race = "Artificial Life"
log.parameters["intelligible"] = 1
else if(isslime(M))
race = "Slime"
else if(isanimal(M))
race = "Domestic Animal"

log.parameters["race"] = race

if(!istype(M, /mob/new_player) && M)
log.parameters["uspeech"] = M.universal_speak
else
log.parameters["uspeech"] = 0

// If the signal is still compressed, make the log entry gibberish
if(signal.data["compression"] > 0)
log.parameters["message"] = Gibberish(signal.data["message"], signal.data["compression"] + 50)
log.parameters["job"] = Gibberish(signal.data["job"], signal.data["compression"] + 50)
log.parameters["name"] = Gibberish(signal.data["name"], signal.data["compression"] + 50)
log.parameters["realname"] = Gibberish(signal.data["realname"], signal.data["compression"] + 50)
log.parameters["vname"] = Gibberish(signal.data["vname"], signal.data["compression"] + 50)
log.input_type = "Corrupt File"

// Log and store everything that needs to be logged
log_entries.Add(log)
if(!(signal.data["name"] in stored_names))
stored_names.Add(signal.data["name"])
logs++
signal.data["server"] = src

// Give the log a name
var/identifier = num2text( rand(-1000,1000) + world.time )
log.name = "data packet ([md5(identifier)])"


//-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------//

obj/machinery/computer/telecomms/server/blackbox
req_access = list()
network = "Blackbox"

/obj/item/weapon/stock_parts/circuitboard/bboxmonitor
name = T_BOARD("black box reader console")
build_path = /obj/machinery/computer/telecomms/server/blackbox
origin_tech = list(TECH_DATA = 3)
7 changes: 2 additions & 5 deletions maps/perseverance/code/XIV_clothes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
icon_state = "manage"
item_state = "manage"
worn_state = "manage"
gender_icons = 0
gender_icons = 1
armor = list(
energy = ARMOR_ENERGY_SMALL,
rad = ARMOR_RAD_MINOR,
Expand All @@ -29,7 +29,4 @@
)

/obj/item/clothing/under/rank/medical/XIV
name = "field medic's jumpsuit"

/obj/item/clothing/under/rank/scientist_new/XIV
name = "fabrication tech's jumpsuit"
name = "field medic's jumpsuit"
39 changes: 36 additions & 3 deletions maps/perseverance/code/XIV_minor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@
stripe_color = COLOR_AMBER

/obj/machinery/door/airlock/autoname/atmos
door_color = COLOR_AMBER
stripe_color = COLOR_CYAN

/obj/machinery/door/airlock/autoname/command
stripe_color = COLOR_COMMAND_BLUE
door_color = COLOR_COMMAND_BLUE

/obj/machinery/door/airlock/autoname/civilian
stripe_color = COLOR_CIVIE_GREEN
Expand Down Expand Up @@ -42,7 +43,8 @@
stripe_color = COLOR_RED

/obj/machinery/door/airlock/multi_tile/glass/autoname/atmos
stripe_color = COLOR_CYAN // I kinda like this atmos, I dunno, might just change it later
door_color = COLOR_AMBER
stripe_color = COLOR_CYAN

/obj/machinery/door/airlock/multi_tile/glass/autoname/civilian
stripe_color = COLOR_CIVIE_GREEN
Expand All @@ -55,6 +57,10 @@
door_color = COLOR_PALE_ORANGE
stripe_color = COLOR_BEASTY_BROWN

/obj/machinery/door/airlock/multi_tile/glass/autoname/command
door_color = COLOR_COMMAND_BLUE
stripe_color = COLOR_SKY_BLUE

///obj/machinery/computer
// icon = 'maps/perseverance/icons/obj/computer.dmi'
// uncomment once derp does the sprites
Expand Down Expand Up @@ -140,6 +146,15 @@

// This one is for areas which would be painted over regularly (in view of people, etc.)

/turf/simulated/wall/prepainted/white
paint_color = COLOR_WHITE

/turf/simulated/wall/prepainted/hull
paint_color = COLOR_HULL

/turf/simulated/wall/titanium/hull
paint_color = COLOR_HULL

/turf/simulated/wall/r_wall/white
paint_color = COLOR_WHITE

Expand Down Expand Up @@ -210,4 +225,22 @@

/obj/structure/closet/crate/actual_radiation_gear/WillContain()
return list(/obj/item/clothing/suit/radiation = 4,
/obj/item/clothing/head/radiation = 4) //other radiation closet only gives the suit ??? What???
/obj/item/clothing/head/radiation = 4) //other radiation closet only gives the suit ??? What???

/obj/structure/closet/crate/fusion
name = "fusion fuel crate"
desc = "A crate with a radiation sign on it."
closet_appearance = /decl/closet_appearance/crate/radiation

/obj/item/stack/material/deuterium/ten //needed for next part
amount = 10

/obj/structure/closet/crate/fusion/WillContain()
return list(/obj/item/stack/material/deuterium/ten = 10,
/obj/item/stack/material/tritium/ten = 4)

//Blue double emergency tank

/obj/item/weapon/tank/emergency/oxygen/double/blue
icon = 'maps/perseverance/icons/obj/tanks.dmi'
icon_state = "emergency_double_blue"
Loading

0 comments on commit 22f6c45

Please sign in to comment.