cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 06:22:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

All jobs

Browse Source
This commit is contained in:
alberyk
2021-09-23 23:07:28 -03:00
parent b75cb00b14
commit ae15e82f76
63 changed files with 432 additions and 727 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/drop_targeter/_droptargeter.dm
+3 -3
View File
@@ -20,7 +20,7 @@
var/drop_message = "Orbital package inbound, clear the targetted area immediately!"
var/drop_message_emagged = "O*b$ital p&ck@ge in#)und, c-c-c-!"
var/announcer_name = "Mining Requests Console"
var/announcer_channel = "Supply" // If not emagged, will announce to this channel. If emagged, will always announce on the common channel.
var/announcer_channel = "Operations" // If not emagged, will announce to this channel. If emagged, will always announce on the common channel.
var/datum/map_template/map
@@ -70,7 +70,7 @@
to_chat(user, SPAN_NOTICE("You paint the target at [target]."))
var/obj/item/device/radio/intercom/announcer = new /obj/item/device/radio/intercom(null)
announcer.config(list("Common" = FALSE, "Entertainment" = FALSE, "Response Team" = FALSE, "Science" = FALSE, "Command" = FALSE, "Medical" = FALSE, "Engineering" = FALSE, "Security" = FALSE, "Penal" = FALSE, "Supply" = FALSE, "Service" = FALSE, "Mercenary" = FALSE, "Raider" = FALSE, "Ninja" = FALSE, "AI Private" = FALSE))
announcer.config(list("Common" = FALSE, "Entertainment" = FALSE, "Response Team" = FALSE, "Science" = FALSE, "Command" = FALSE, "Medical" = FALSE, "Engineering" = FALSE, "Security" = FALSE, "Penal" = FALSE, "Operations" = FALSE, "Service" = FALSE, "Mercenary" = FALSE, "Raider" = FALSE, "Ninja" = FALSE, "AI Private" = FALSE))
if(announcer)
if(!emagged)
announcer.autosay(drop_message, announcer_name, announcer_channel)
@@ -90,7 +90,7 @@
return
log_and_message_admins("[key_name_admin(user)] has used a [src] at <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[target.x];Y=[target.y];Z=[target.z]'>JMP</a>.")
map.load(target, TRUE) //Target must be the center!
/obj/item/device/orbital_dropper/emag_act(var/remaining_charges, var/mob/user)
if(!emagged)
code/game/objects/items/devices/megaphone.dm
+1 -1
View File
@@ -97,7 +97,7 @@
/obj/item/device/megaphone/cargo
name = "supply megaphone"
desc = "To make people to push crates."
desc_fluff = "Only certified forklift operators will be able to handle the sheer power of this megaphone. Either that, or just be the Quartermaster."
desc_fluff = "Only certified forklift operators will be able to handle the sheer power of this megaphone. Either that, or just be the Operations Manager."
icon_state = "megaphone_cargo"
item_state = "megaphone_cargo"
code/game/objects/items/devices/radio/_radio_defines.dm
+1 -1
View File
@@ -5,7 +5,7 @@
#define CHANNEL_MEDICAL "Medical"
#define CHANNEL_ENGINEERING "Engineering"
#define CHANNEL_SECURITY "Security"
#define CHANNEL_SUPPLY "Supply"
#define CHANNEL_SUPPLY "Operations"
#define CHANNEL_SERVICE "Service"
#define CHANNEL_AI_PRIVATE "AI Private"
#define CHANNEL_PENAL "Penal"
code/game/objects/items/devices/radio/encryptionkey.dm
+7 -7
View File
@@ -136,21 +136,21 @@
icon_state = "cmo_cypherkey"
channels = list(CHANNEL_MEDICAL = TRUE, CHANNEL_COMMAND = TRUE)
/obj/item/device/encryptionkey/heads/hop
name = "head of personnel's encryption key"
icon_state = "hop_cypherkey"
channels = list(CHANNEL_SUPPLY = TRUE, CHANNEL_SERVICE = TRUE, CHANNEL_COMMAND = TRUE, CHANNEL_SECURITY = TRUE, CHANNEL_PENAL = TRUE)
/obj/item/device/encryptionkey/heads/xo
name = "executive officer's encryption key"
icon_state = "hop_cypherkey"
channels = list(CHANNEL_SERVICE = TRUE, CHANNEL_COMMAND = TRUE, CHANNEL_SECURITY = TRUE, CHANNEL_PENAL = TRUE)
/obj/item/device/encryptionkey/headset_cargo
name = "supply radio encryption key"
name = "operations radio encryption key"
icon_state = "cargo_cypherkey"
channels = list(CHANNEL_SUPPLY = TRUE)
/obj/item/device/encryptionkey/headset_operations_manager
name = "operations managaer radio encryption key"
icon_state = "cargo_cypherkey"
channels = list(CHANNEL_COMMAND = TRUE, CHANNEL_SUPPLY = TRUE)
/obj/item/device/encryptionkey/headset_service
name = "service radio encryption key"
icon_state = "srv_cypherkey"
@@ -188,7 +188,7 @@
additional_channels = list(CHANNEL_SCIENCE = TRUE)
/obj/item/device/encryptionkey/cargo_spare
name = "spare supply radio encryption key"
name = "spare operations radio encryption key"
additional_channels = list(CHANNEL_SUPPLY = TRUE)
/obj/item/device/encryptionkey/service_spare
code/game/objects/items/devices/radio/headset.dm
+14 -37
View File
@@ -233,36 +233,13 @@
item_state = "wristset_srv"
ks2type = /obj/item/device/encryptionkey/headset_service
/obj/item/device/radio/headset/heads/hop
name = "head of personnel's headset"
desc = "The headset of the guy who will one day be captain."
icon_state = "hop_headset"
ks2type = /obj/item/device/encryptionkey/heads/hop
/obj/item/device/radio/headset/heads/hop/alt
name = "head of personnel's bowman headset"
icon_state = "hop_headset_alt"
item_state = "headset_alt"
/obj/item/device/radio/headset/alt/double/hop
name = "head of personnel's soundproof headset"
icon_state = "earset_HoP"
item_state = "earset_HoP"
ks2type = /obj/item/device/encryptionkey/heads/hop
/obj/item/device/radio/headset/wrist/hop
name = "head of personnel's wristbound radio"
icon_state = "wristset_HoP"
item_state = "wristset_HoP"
ks2type = /obj/item/device/encryptionkey/heads/hop
/obj/item/device/radio/headset/heads/xo
name = "executive officer's headset"
desc = "The headset of the guy who will one day be captain."
icon_state = "hop_headset"
ks2type = /obj/item/device/encryptionkey/heads/hop
ks2type = /obj/item/device/encryptionkey/heads/xo
/obj/item/device/radio/headset/heads/hop/xo
/obj/item/device/radio/headset/heads/xo/alt
name = "executive officer's bowman headset"
icon_state = "hop_headset_alt"
item_state = "headset_alt"
@@ -273,7 +250,7 @@
item_state = "earset_HoP"
ks2type = /obj/item/device/encryptionkey/heads/xo
/obj/item/device/radio/headset/wrist/hop
/obj/item/device/radio/headset/wrist/xo
name = "executive officer's wristbound radio"
icon_state = "wristset_HoP"
item_state = "wristset_HoP"
@@ -336,7 +313,7 @@
/obj/item/device/radio/headset/headset_cargo
name = "supply radio headset"
desc = "A headset used by the quartermaster's slaves."
desc = "A headset used by the operations manager's slaves."
icon_state = "cargo_headset"
ks2type = /obj/item/device/encryptionkey/headset_cargo
@@ -380,25 +357,25 @@
icon_state = "wristset_mine"
item_state = "wristset_mine"
/obj/item/device/radio/headset/qm
name = "quartermaster's headset"
/obj/item/device/radio/headset/operations_manager
name = "operations manager's headset"
desc = "A headset used by the head honcho of paper pushing."
icon_state = "qm_headset"
ks2type = /obj/item/device/encryptionkey/headset_cargo
ks2type = /obj/item/device/encryptionkey/headset_operations_manager
/obj/item/device/radio/headset/qm/alt
name = "quartermaster bowman headset"
/obj/item/device/radio/headset/operations_manager/alt
name = "operations manager bowman headset"
icon_state = "qm_headset_alt"
item_state = "headset_alt"
/obj/item/device/radio/headset/alt/double/qm
name = "soundproof quartermaster headset"
/obj/item/device/radio/headset/alt/double/operations_manager
name = "soundproof operations manager headset"
icon_state = "earset_QM"
item_state = "earset_QM"
ks2type = /obj/item/device/encryptionkey/headset_cargo
ks2type = /obj/item/device/encryptionkey/headset_operations_manager
/obj/item/device/radio/headset/wrist/cargo/qm
name = "wristbound quartermaster radio"
/obj/item/device/radio/headset/wrist/cargo/operations_manager
name = "wristbound operations manager radio"
icon_state = "wristset_QM"
item_state = "wristset_QM"
code/game/objects/items/weapons/manuals.dm
+2 -2
View File
@@ -1398,7 +1398,7 @@
name = "Guide to Custom Kinetic Accelerators"
icon_state = "rulebook"
item_state = "book1"
author = "Quartermaster Burgs"
author = "Quartermaster Longson"
title = "Guide to Custom Kinetic Accelerators"
dat = {"<html>
<head>
@@ -1413,7 +1413,7 @@
</head>
<body>
<h1>Metal Snowflake: Your Guide to Custom Kinetic Accelerators</h1>
<h2>by Quartermaster Burgs</h2>
<h2>by Quartermaster Longson</h2>
<br>
<p>So you want to make your own custom kinetic accelerator. While it may look simple to take apart, swap, and modify parts to fit your working needs, there are a few things to keep in mind before assembling.</p>
code/game/objects/structures/bedsheet_bin.dm
+4 -4
View File
@@ -269,14 +269,14 @@ LINEN BINS
icon_state = "sheetcmo"
item_state = "sheetcmo"
/obj/item/bedsheet/qm
name = "quartermaster's bedsheet"
/obj/item/bedsheet/operation_manager
name = "operation manager's bedsheet"
desc = "It is decorated with a crate emblem in silver lining. It's rather tough, and just the thing to lie on after a hard day of pushing paper."
icon_state = "sheetqm"
item_state = "sheetqm"
/obj/item/bedsheet/hop
name = "head of personnel's bedsheet"
/obj/item/bedsheet/xo
name = "executive officer's bedsheet"
desc = "It is decorated with a key emblem. For those rare moments when you can rest and cuddle with Ian without someone screaming for you over the radio."
icon_state = "sheethop"
item_state = "sheethop"
code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
+10 -11
View File
@@ -1,5 +1,5 @@
/obj/structure/closet/secure_closet/cargotech
name = "cargo technician's locker"
/obj/structure/closet/secure_closet/hangartech
name = "hangar technician's locker"
req_access = list(access_cargo)
icon_state = "securecargo1"
icon_closed = "securecargo"
@@ -8,10 +8,9 @@
icon_broken = "securecargobroken"
icon_off = "securecargooff"
/obj/structure/closet/secure_closet/cargotech/fill()
/obj/structure/closet/secure_closet/hangartech/fill()
..()
new /obj/item/clothing/under/rank/cargo(src)
new /obj/item/clothing/under/rank/cargo/alt(src)
new /obj/item/clothing/under/rank/hangar_technician(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/device/radio/headset/headset_cargo(src)
new /obj/item/device/radio/headset/headset_cargo/alt(src)
@@ -22,8 +21,8 @@
new /obj/item/modular_computer/handheld/preset/supply/cargo_delivery(src)
new /obj/item/export_scanner(src)
/obj/structure/closet/secure_closet/quartermaster
name = "quartermaster's locker"
/obj/structure/closet/secure_closet/operation_manager
name = "operation manager's locker"
req_access = list(access_qm)
icon_state = "secureqm1"
icon_closed = "secureqm"
@@ -32,11 +31,11 @@
icon_broken = "secureqmbroken"
icon_off = "secureqmoff"
/obj/structure/closet/secure_closet/quartermaster/fill()
new /obj/item/clothing/under/rank/quartermaster(src)
/obj/structure/closet/secure_closet/operation_manager/fill()
new /obj/item/clothing/under/rank/operations_manager(src)
new /obj/item/clothing/shoes/brown(src)
new /obj/item/device/radio/headset/qm(src)
new /obj/item/device/radio/headset/qm/alt(src)
new /obj/item/device/radio/headset/operations_manager(src)
new /obj/item/device/radio/headset/operations_manager/alt(src)
new /obj/item/clothing/gloves/black(src)
new /obj/item/clothing/suit/fire(src)
new /obj/item/tank/emergency_oxygen(src)
code/game/objects/structures/crates_lockers/closets/secure/security.dm
+7 -31
View File
@@ -55,8 +55,8 @@
new /obj/item/clothing/head/helmet/formalcaptain(src)
new /obj/item/clothing/under/captainformal(src)
/obj/structure/closet/secure_closet/hop
name = "head of personnel's locker"
/obj/structure/closet/secure_closet/xo
name = "executive officer's locker"
req_access = list(access_hop)
icon_state = "hopsecure1"
icon_closed = "hopsecure"
@@ -78,16 +78,16 @@
new /obj/item/clothing/head/helmet(src)
new /obj/item/clothing/accessory/holster/waist(src)
//Tools
new /obj/item/device/radio/headset/heads/hop(src)
new /obj/item/device/radio/headset/heads/hop/alt(src)
new /obj/item/device/radio/headset/heads/xo(src)
new /obj/item/device/radio/headset/heads/xo/alt(src)
new /obj/item/device/megaphone/command(src)
new /obj/item/storage/box/goldstar(src)
new /obj/item/gun/energy/disruptorpistol(src)
new /obj/item/gun/projectile/sec/flash(src)
new /obj/item/device/flash(src)
/obj/structure/closet/secure_closet/hop2
name = "head of personnel's attire"
/obj/structure/closet/secure_closet/xo
name = "executive officer's attire"
req_access = list(access_hop)
icon_state = "hopsecure1"
icon_closed = "hopsecure"
@@ -98,16 +98,13 @@
/obj/structure/closet/secure_closet/hop2/fill()
..()
new /obj/item/clothing/under/rank/head_of_personnel(src)
new /obj/item/clothing/under/dress/dress_hop(src)
new /obj/item/clothing/under/rank/xo(src)
new /obj/item/clothing/under/lawyer/black(src)
new /obj/item/clothing/under/lawyer/red(src)
new /obj/item/clothing/under/rank/head_of_personnel_whimsy(src)
new /obj/item/clothing/shoes/brown(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/shoes/laceup/brown(src)
new /obj/item/clothing/shoes/white(src)
new /obj/item/clothing/head/caphat/hop(src)
/obj/structure/closet/secure_closet/hos
name = "head of security's locker"
@@ -326,27 +323,6 @@
new /obj/item/clothing/accessory/holster/hip(src)
new /obj/item/storage/belt/security(src)
/obj/structure/closet/secure_closet/security/cargo/fill()
..()
new /obj/item/clothing/accessory/armband/cargo(src)
new /obj/item/device/encryptionkey/headset_cargo(src)
/obj/structure/closet/secure_closet/security/engine/fill()
..()
new /obj/item/clothing/accessory/armband/engine(src)
new /obj/item/device/encryptionkey/headset_eng(src)
/obj/structure/closet/secure_closet/security/science/fill()
..()
new /obj/item/clothing/accessory/armband/science(src)
new /obj/item/device/encryptionkey/headset_sci(src)
/obj/structure/closet/secure_closet/security/med/fill()
..()
new /obj/item/clothing/accessory/armband/medgreen(src)
new /obj/item/device/encryptionkey/headset_med(src)
/obj/structure/closet/secure_closet/investigator
name = "investigator's locker"
req_access = list(access_forensics_lockers)
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+4 -4
View File
@@ -279,15 +279,15 @@
return
/obj/structure/closet/wardrobe/robotics_black
name = "robotics wardrobe"
/obj/structure/closet/wardrobe/manufacturing_tech
name = "manufacturing technician wardrobe"
icon_state = "black"
icon_closed = "black"
/obj/structure/closet/wardrobe/robotics_black/fill()
..()
new /obj/item/clothing/under/rank/roboticist(src)
new /obj/item/clothing/under/rank/roboticist(src)
new /obj/item/clothing/under/rank/manufacturing_tech(src)
new /obj/item/clothing/under/rank/manufacturing_tech(src)
new /obj/item/clothing/suit/storage/toggle/labcoat(src)
new /obj/item/clothing/suit/storage/toggle/labcoat(src)
new /obj/item/clothing/shoes/black(src)