mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-22 04:24:20 +01:00
You can now interact with belts that are not on your belt slot.
Added Security Belts, 4 slot belt that can carry basic sec gear. The security shuttle control can now be emag'd. Removed the old take off and stabilize verbs for the pshuttle. Cleaned up some computer defines. The detective's cabinet is now a secure cabinet. Most of the secure closets cleaned up a bit. The captain no longer spawns with an ID box in his backpack. RD's locker got its flash back. Added the blob node sprites. Removed the 2% laser resist that normal jumpsuits gave. Normal clothing should not be blocking lasers. Left the 10% special block on each department. Riot suit slowdown lowered to 1 from 2.5 Repiped the right side of sec and tidied up the powerlines. Loyalty Implanter moved into the outer rec room checkpoint. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2277 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
mport2004@gmail.com
+110
-135
@@ -5,12 +5,6 @@
|
||||
anchored = 1.0
|
||||
var/obj/item/weapon/circuitboard/circuit = null //if circuit==null, computer can't disassemble
|
||||
|
||||
/*
|
||||
/obj/machinery/computer/airtunnel
|
||||
name = "Air Tunnel Control"
|
||||
icon = 'airtunnelcomputer.dmi'
|
||||
icon_state = "console00"
|
||||
*/
|
||||
|
||||
/obj/machinery/computer/operating
|
||||
name = "Operating Computer"
|
||||
@@ -18,15 +12,10 @@
|
||||
anchored = 1.0
|
||||
icon_state = "operating"
|
||||
circuit = "/obj/item/weapon/circuitboard/operating"
|
||||
|
||||
var/mob/living/carbon/human/victim = null
|
||||
|
||||
var/obj/machinery/optable/table = null
|
||||
var/id = 0.0
|
||||
|
||||
/*
|
||||
* Arcade -- An arcade cabinet.
|
||||
*/
|
||||
|
||||
/obj/machinery/computer/arcade
|
||||
name = "arcade machine"
|
||||
@@ -43,41 +32,46 @@
|
||||
var/gameover = 0
|
||||
var/blocked = 0 //Player cannot attack/heal while set
|
||||
|
||||
|
||||
/obj/machinery/computer/aiupload
|
||||
name = "AI Upload"
|
||||
desc = "It is said that you can upload silly laws to AI's with this."
|
||||
desc = "Used to upload laws to the AI."
|
||||
icon_state = "command"
|
||||
circuit = "/obj/item/weapon/circuitboard/aiupload"
|
||||
var/mob/living/silicon/ai/current = null
|
||||
var/opened = 0
|
||||
|
||||
|
||||
/obj/machinery/computer/borgupload
|
||||
name = "Cyborg Upload"
|
||||
desc = "Used for uploading responsible laws to Cyborg. Right..."
|
||||
desc = "Used to upload laws to Cyborgs."
|
||||
icon_state = "command"
|
||||
circuit = "/obj/item/weapon/circuitboard/borgupload"
|
||||
var/mob/living/silicon/robot/current = null
|
||||
|
||||
/obj/machinery/computer/atmosphere
|
||||
name = "atmos"
|
||||
desc = "A computer for Atmospherics."
|
||||
|
||||
/obj/machinery/computer/station_alert
|
||||
name = "Station Alert Computer"
|
||||
desc = "Alert. Alert. ALERT!!!"
|
||||
desc = "Used to access the station's automated alert system."
|
||||
icon_state = "alert:0"
|
||||
circuit = "/obj/item/weapon/circuitboard/stationalert"
|
||||
var/alarms = list("Fire"=list(), "Atmosphere"=list(), "Power"=list())
|
||||
|
||||
|
||||
/obj/machinery/computer/atmos_alert
|
||||
name = "Atmospheric Alert Computer"
|
||||
desc = "Used to detect where they messed up this time."
|
||||
desc = "Used to access the station's atmospheric sensors."
|
||||
icon_state = "alert:0"
|
||||
var/list/priority_alarms = list()
|
||||
var/list/minor_alarms = list()
|
||||
var/receive_frequency = 1437
|
||||
|
||||
|
||||
/obj/machinery/computer/atmosphere
|
||||
name = "atmos"
|
||||
desc = "A computer for Atmospherics."
|
||||
|
||||
|
||||
/obj/machinery/computer/atmosphere/siphonswitch
|
||||
name = "Area Air Control"
|
||||
desc = "Nanotrasen provided this, barely."
|
||||
@@ -85,12 +79,14 @@
|
||||
var/otherarea
|
||||
var/area/area
|
||||
|
||||
|
||||
/obj/machinery/computer/atmosphere/siphonswitch/mastersiphonswitch
|
||||
name = "Master Air Control"
|
||||
|
||||
|
||||
/obj/machinery/computer/card
|
||||
name = "Identification Computer"
|
||||
desc = "You can use this to change ID's. YOU ARE GOD!"
|
||||
desc = "You can use this to change ID's."
|
||||
icon_state = "id"
|
||||
circuit = "/obj/item/weapon/circuitboard/card"
|
||||
var/obj/item/weapon/card/id/scan = null
|
||||
@@ -100,29 +96,13 @@
|
||||
var/printing = null
|
||||
req_access = list(access_change_ids)
|
||||
|
||||
//ID changing computer for CentCom.
|
||||
|
||||
/obj/machinery/computer/card/centcom
|
||||
name = "CentCom Identification Computer"
|
||||
desc = "You are the Gods's God."
|
||||
circuit = "/obj/item/weapon/circuitboard/card/centcom"
|
||||
req_access = list(access_cent_captain)
|
||||
|
||||
|
||||
/obj/machinery/computer/data
|
||||
name = "data"
|
||||
icon_state = "aiupload"
|
||||
|
||||
var/list/topics = list( )
|
||||
|
||||
/obj/machinery/computer/data/weapon
|
||||
name = "weapon"
|
||||
|
||||
/obj/machinery/computer/data/weapon/info
|
||||
name = "Research Computer"
|
||||
|
||||
/obj/machinery/computer/data/weapon/log
|
||||
name = "Log Computer"
|
||||
|
||||
/obj/machinery/computer/dna
|
||||
name = "DNA operations computer"
|
||||
desc = "A Computer used to advanced DNA stuff."
|
||||
@@ -133,6 +113,7 @@
|
||||
var/mode = null
|
||||
var/temp = null
|
||||
|
||||
|
||||
/obj/machinery/computer/hologram_comp
|
||||
name = "Hologram Computer"
|
||||
desc = "Rumoured to control holograms."
|
||||
@@ -145,6 +126,7 @@
|
||||
var/h_g = 245.0
|
||||
var/h_b = 245.0
|
||||
|
||||
|
||||
/obj/machinery/computer/med_data
|
||||
name = "Medical Records"
|
||||
desc = "This can be used to check medical records."
|
||||
@@ -161,11 +143,13 @@
|
||||
var/temp = null
|
||||
var/printing = null
|
||||
|
||||
|
||||
/obj/machinery/computer/med_data/laptop
|
||||
name = "Medical Laptop"
|
||||
desc = "Cheap Nanotrasen Laptop."
|
||||
icon_state = "medlaptop"
|
||||
|
||||
|
||||
/obj/machinery/computer/pod
|
||||
name = "Pod Launch Control"
|
||||
desc = "A controll for launching pods. Some people prefer firing Mechas."
|
||||
@@ -175,19 +159,108 @@
|
||||
var/timing = 0.0
|
||||
var/time = 30.0
|
||||
|
||||
|
||||
/obj/machinery/computer/pod/old
|
||||
icon_state = "old"
|
||||
name = "DoorMex Control Computer"
|
||||
|
||||
|
||||
/obj/machinery/computer/pod/old/syndicate
|
||||
name = "ProComp Executive IIc"
|
||||
desc = "The Syndicate operate on a tight budget. Operates external airlocks."
|
||||
|
||||
|
||||
/obj/machinery/computer/pod/old/swf
|
||||
name = "Magix System IV"
|
||||
desc = "An arcane artifact that holds much magic. Running E-Knock 2.2: Sorceror's Edition"
|
||||
|
||||
/*/obj/machinery/computer/scan_consolenew //Coming Soon
|
||||
|
||||
/obj/machinery/computer/secure_data
|
||||
name = "Security Records"
|
||||
desc = "Used to view and edit personnel's security records"
|
||||
icon_state = "security"
|
||||
req_access = list(access_security)
|
||||
circuit = "/obj/item/weapon/circuitboard/secure_data"
|
||||
var/obj/item/weapon/card/id/scan = null
|
||||
var/authenticated = null
|
||||
var/rank = null
|
||||
var/screen = null
|
||||
var/datum/data/record/active1 = null
|
||||
var/datum/data/record/active2 = null
|
||||
var/a_id = null
|
||||
var/temp = null
|
||||
var/printing = null
|
||||
var/can_change_id = 0
|
||||
|
||||
|
||||
/obj/machinery/computer/secure_data/detective_computer
|
||||
icon = 'computer.dmi'
|
||||
icon_state = "messyfiles"
|
||||
|
||||
|
||||
/obj/machinery/computer/security
|
||||
name = "Security Cameras"
|
||||
desc = "Used to access the various cameras on the station."
|
||||
icon_state = "cameras"
|
||||
circuit = "/obj/item/weapon/circuitboard/security"
|
||||
var/obj/machinery/camera/current = null
|
||||
var/last_pic = 1.0
|
||||
var/network = "SS13"
|
||||
var/maplevel = 1
|
||||
|
||||
|
||||
/obj/machinery/computer/security/telescreen
|
||||
name = "Telescreen"
|
||||
desc = "Used for watching an empty arena."
|
||||
icon = 'stationobjs.dmi'
|
||||
icon_state = "telescreen"
|
||||
network = "thunder"
|
||||
density = 0
|
||||
circuit = null
|
||||
|
||||
|
||||
/obj/machinery/computer/security/wooden_tv
|
||||
name = "Security Cameras"
|
||||
desc = "An old TV hooked into the stations camera network."
|
||||
icon_state = "security_det"
|
||||
|
||||
|
||||
/obj/machinery/computer/security/mining
|
||||
name = "Outpost Cameras"
|
||||
desc = "Used to access the various cameras on the outpost."
|
||||
icon_state = "miningcameras"
|
||||
network = "MINE"
|
||||
circuit = "/obj/item/weapon/circuitboard/mining"
|
||||
|
||||
|
||||
/obj/machinery/computer/crew
|
||||
name = "Crew monitoring computer"
|
||||
desc = "Used to monitor active health sensors built into most of the crew's uniforms."
|
||||
icon_state = "crew"
|
||||
use_power = 1
|
||||
idle_power_usage = 250
|
||||
active_power_usage = 500
|
||||
circuit = "/obj/item/weapon/circuitboard/crew"
|
||||
var/list/tracked = list( )
|
||||
|
||||
|
||||
/obj/machinery/computer/robotics
|
||||
name = "Robotics Control"
|
||||
desc = "Used to remotely lockdown or detonate linked Cyborgs."
|
||||
icon = 'computer.dmi'
|
||||
icon_state = "robot"
|
||||
req_access = list(access_robotics)
|
||||
circuit = "/obj/item/weapon/circuitboard/robotics"
|
||||
|
||||
var/id = 0.0
|
||||
var/temp = null
|
||||
var/status = 0
|
||||
var/timeleft = 60
|
||||
var/stop = 0.0
|
||||
var/screen = 0 // 0 - Main Menu, 1 - Cyborg Status, 2 - Kill 'em All! -- In text
|
||||
|
||||
|
||||
/*/obj/machinery/computer/scan_consolenew //Coming Soon, I highly doubt this but Ill leave it here anyways
|
||||
name = "DNA Modifier Access Console"
|
||||
desc = "Scand DNA."
|
||||
icon = 'computer.dmi'
|
||||
@@ -224,101 +297,3 @@
|
||||
use_power = 1
|
||||
idle_power_usage = 10
|
||||
active_power_usage = 400 */
|
||||
|
||||
/obj/machinery/computer/secure_data
|
||||
name = "Security Records"
|
||||
desc = "Beepsky. ARREST!!!"
|
||||
icon_state = "security"
|
||||
req_access = list(access_security)
|
||||
circuit = "/obj/item/weapon/circuitboard/secure_data"
|
||||
var/obj/item/weapon/card/id/scan = null
|
||||
var/authenticated = null
|
||||
var/rank = null
|
||||
var/screen = null
|
||||
var/datum/data/record/active1 = null
|
||||
var/datum/data/record/active2 = null
|
||||
var/a_id = null
|
||||
var/temp = null
|
||||
var/printing = null
|
||||
var/can_change_id = 0
|
||||
|
||||
/obj/machinery/computer/secure_data/detective_computer
|
||||
icon = 'computer.dmi'
|
||||
icon_state = "messyfiles"
|
||||
|
||||
/obj/machinery/computer/security
|
||||
name = "Security Cameras"
|
||||
desc = "Better than Television."
|
||||
icon_state = "cameras"
|
||||
circuit = "/obj/item/weapon/circuitboard/security"
|
||||
var/obj/machinery/camera/current = null
|
||||
var/last_pic = 1.0
|
||||
var/network = "SS13"
|
||||
var/maplevel = 1
|
||||
|
||||
/obj/machinery/computer/security/telescreen
|
||||
name = "Telescreen"
|
||||
desc = "Used for watching an empty arena."
|
||||
icon = 'stationobjs.dmi'
|
||||
icon_state = "telescreen"
|
||||
network = "thunder"
|
||||
density = 0
|
||||
circuit = null
|
||||
|
||||
/obj/machinery/computer/security/wooden_tv
|
||||
name = "Security Cameras"
|
||||
desc = "Nanotrasen gave the detective this for Noir feeling."
|
||||
icon_state = "security_det"
|
||||
|
||||
/obj/machinery/computer/security/mining
|
||||
name = "Outpost Status Display"
|
||||
desc = "It's better than reality TV."
|
||||
icon_state = "miningcameras"
|
||||
network = "MINE"
|
||||
circuit = "/obj/item/weapon/circuitboard/mining"
|
||||
|
||||
/obj/machinery/computer/shuttle
|
||||
name = "Shuttle"
|
||||
desc = "For shuttle controll."
|
||||
icon_state = "shuttle"
|
||||
var/auth_need = 3.0
|
||||
var/list/authorized = list( )
|
||||
|
||||
/obj/machinery/computer/teleporter
|
||||
name = "Teleporter"
|
||||
desc = "Use this to set your destination...hopefully..."
|
||||
icon_state = "teleport"
|
||||
circuit = "/obj/item/weapon/circuitboard/teleporter"
|
||||
var/obj/item/locked = null
|
||||
var/id = null
|
||||
|
||||
/obj/machinery/computer/teleporter/security
|
||||
name = "Teleporter"
|
||||
desc = "Use this to set your destination...hopefully..."
|
||||
icon_state = "teleport"
|
||||
locked = null
|
||||
id = null
|
||||
|
||||
/obj/machinery/computer/crew
|
||||
name = "Crew monitoring computer"
|
||||
icon_state = "crew"
|
||||
use_power = 1
|
||||
idle_power_usage = 250
|
||||
active_power_usage = 500
|
||||
circuit = "/obj/item/weapon/circuitboard/crew"
|
||||
var/list/tracked = list( )
|
||||
|
||||
/obj/machinery/computer/robotics
|
||||
name = "Robotics Control"
|
||||
icon = 'computer.dmi'
|
||||
icon_state = "robot"
|
||||
req_access = list(access_robotics)
|
||||
circuit = "/obj/item/weapon/circuitboard/robotics"
|
||||
|
||||
var/id = 0.0
|
||||
var/temp = null
|
||||
var/status = 0
|
||||
var/timeleft = 60
|
||||
var/stop = 0.0
|
||||
var/screen = 0 // 0 - Main Menu, 1 - Cyborg Status, 2 - Kill 'em All! -- In text
|
||||
|
||||
|
||||
Reference in New Issue
Block a user