shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

here we go again (#2456)

Browse Source
This commit is contained in:
LetterJay
2017-08-24 21:24:25 -05:00
committed by kevinz000
parent c7ed043fd5
commit 188193eb61
1107 changed files with 25420 additions and 25417 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/shuttle/arrivals.dm
+1 -1
View File
@@ -125,7 +125,7 @@
return FALSE
/obj/docking_port/mobile/arrivals/proc/NukeDiskCheck()
for (var/obj/item/weapon/disk/nuclear/N in GLOB.poi_list)
for (var/obj/item/disk/nuclear/N in GLOB.poi_list)
if (get_area(N) in areas)
return TRUE
return FALSE
code/modules/shuttle/computer.dm
+3 -3
View File
@@ -4,7 +4,7 @@
icon_keyboard = "tech_key"
light_color = LIGHT_COLOR_CYAN
req_access = list( )
circuit = /obj/item/weapon/circuitboard/computer/shuttle
circuit = /obj/item/circuitboard/computer/shuttle
var/shuttleId
var/possible_destinations = ""
var/admin_controlled
@@ -15,8 +15,8 @@
return INITIALIZE_HINT_LATELOAD
/obj/machinery/computer/shuttle/LateInitialize()
if(istype(circuit, /obj/item/weapon/circuitboard/computer/shuttle))
var/obj/item/weapon/circuitboard/computer/shuttle/C = circuit
if(istype(circuit, /obj/item/circuitboard/computer/shuttle))
var/obj/item/circuitboard/computer/shuttle/C = circuit
possible_destinations = C.possible_destinations
shuttleId = C.shuttleId
code/modules/shuttle/emergency.dm
+19 -19
View File
@@ -12,7 +12,7 @@
var/list/authorized = list()
/obj/machinery/computer/emergency_shuttle/attackby(obj/item/I, mob/user,params)
if(istype(I, /obj/item/weapon/card/id))
if(istype(I, /obj/item/card/id))
say("Please equip your ID card into your ID slot to authenticate.")
. = ..()
@@ -32,7 +32,7 @@
data["authorizations_remaining"] = max((auth_need - authorized.len), 0)
var/list/A = list()
for(var/i in authorized)
var/obj/item/weapon/card/id/ID = i
var/obj/item/card/id/ID = i
var/name = ID.registered_name
var/job = ID.assignment
@@ -57,7 +57,7 @@
var/mob/user = usr
. = FALSE
var/obj/item/weapon/card/id/ID = user.get_idcard()
var/obj/item/card/id/ID = user.get_idcard()
if(!ID)
to_chat(user, "<span class='warning'>You don't have an ID.</span>")
@@ -93,12 +93,12 @@
minor_announce("Early launch authorization revoked, [remaining] authorizations needed")
/obj/machinery/computer/emergency_shuttle/proc/authorize(mob/user, source)
var/obj/item/weapon/card/id/ID = user.get_idcard()
var/obj/item/card/id/ID = user.get_idcard()
if(ID in authorized)
return FALSE
for(var/i in authorized)
var/obj/item/weapon/card/id/other = i
var/obj/item/card/id/other = i
if(other.registered_name == ID.registered_name)
return FALSE // No using IDs with the same name
@@ -154,7 +154,7 @@
for(var/i in 1 to 10)
// the shuttle system doesn't know who these people are, but they
// must be important, surely
var/obj/item/weapon/card/id/ID = new(src)
var/obj/item/card/id/ID = new(src)
var/datum/job/J = pick(SSjob.occupations)
ID.registered_name = S.random_name(pick(MALE, FEMALE))
ID.assignment = J.title
@@ -167,7 +167,7 @@
// Our fake IDs that the emag generated are just there for colour
// They're not supposed to be accessible
for(var/obj/item/weapon/card/id/ID in src)
for(var/obj/item/card/id/ID in src)
qdel(ID)
if(authorized && authorized.len)
authorized.Cut()
@@ -500,11 +500,11 @@
item_state = "syndicate-orange"
slowdown = 3
/obj/item/weapon/pickaxe/emergency
/obj/item/pickaxe/emergency
name = "emergency disembarkation tool"
desc = "For extracting yourself from rough landings."
/obj/item/weapon/storage/pod
/obj/item/storage/pod
name = "emergency space suits"
desc = "A wall mounted safe containing space suits. Will only open in emergencies."
anchored = TRUE
@@ -513,30 +513,30 @@
icon_state = "safe"
var/unlocked = FALSE
/obj/item/weapon/storage/pod/PopulateContents()
/obj/item/storage/pod/PopulateContents()
new /obj/item/clothing/head/helmet/space/orange(src)
new /obj/item/clothing/head/helmet/space/orange(src)
new /obj/item/clothing/suit/space/orange(src)
new /obj/item/clothing/suit/space/orange(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/weapon/tank/internals/oxygen/red(src)
new /obj/item/weapon/tank/internals/oxygen/red(src)
new /obj/item/weapon/pickaxe/emergency(src)
new /obj/item/weapon/pickaxe/emergency(src)
new /obj/item/weapon/survivalcapsule(src)
new /obj/item/weapon/storage/toolbox/emergency(src)
new /obj/item/tank/internals/oxygen/red(src)
new /obj/item/tank/internals/oxygen/red(src)
new /obj/item/pickaxe/emergency(src)
new /obj/item/pickaxe/emergency(src)
new /obj/item/survivalcapsule(src)
new /obj/item/storage/toolbox/emergency(src)
/obj/item/weapon/storage/pod/attackby(obj/item/weapon/W, mob/user, params)
/obj/item/storage/pod/attackby(obj/item/W, mob/user, params)
return
/obj/item/weapon/storage/pod/MouseDrop(over_object, src_location, over_location)
/obj/item/storage/pod/MouseDrop(over_object, src_location, over_location)
if(GLOB.security_level == SEC_LEVEL_RED || GLOB.security_level == SEC_LEVEL_DELTA || unlocked)
. = ..()
else
to_chat(usr, "The storage unit will only unlock during a Red or Delta security alert.")
/obj/item/weapon/storage/pod/attack_hand(mob/user)
/obj/item/storage/pod/attack_hand(mob/user)
return MouseDrop(user)
/obj/docking_port/mobile/emergency/backup
code/modules/shuttle/ferry.dm
+2 -2
View File
@@ -1,6 +1,6 @@
/obj/machinery/computer/shuttle/ferry
name = "transport ferry console"
circuit = /obj/item/weapon/circuitboard/computer/ferry
circuit = /obj/item/circuitboard/computer/ferry
shuttleId = "ferry"
possible_destinations = "ferry_home;ferry_away"
req_access = list(ACCESS_CENT_GENERAL)
@@ -16,7 +16,7 @@
/obj/machinery/computer/shuttle/ferry/request
name = "ferry console"
circuit = /obj/item/weapon/circuitboard/computer/ferry/request
circuit = /obj/item/circuitboard/computer/ferry/request
var/last_request //prevents spamming admins
var/cooldown = 600
possible_destinations = "ferry_home;ferry_away"
code/modules/shuttle/on_move.dm
+1 -1
View File
@@ -297,7 +297,7 @@ All ShuttleMove procs go here
/************************************Item move procs************************************/
/obj/item/weapon/storage/pod/onShuttleMove()
/obj/item/storage/pod/onShuttleMove()
unlocked = TRUE
// If the pod was launched, the storage will always open.
return ..()
code/modules/shuttle/special.dm
+3 -3
View File
@@ -164,7 +164,7 @@
/mob/living/simple_animal/hostile/alien/maid/barmaid/Initialize()
. = ..()
access_card = new /obj/item/weapon/card/id(src)
access_card = new /obj/item/card/id(src)
var/datum/job/captain/C = new /datum/job/captain
access_card.access = C.get_access()
access_card.access |= ACCESS_CENT_BAR
@@ -206,7 +206,7 @@
if(H.mind && H.mind.assigned_role == "Bartender")
return TRUE
var/obj/item/weapon/card/id/ID = user.get_idcard()
var/obj/item/card/id/ID = user.get_idcard()
if(ID && (ACCESS_CENT_BAR in ID.access))
return TRUE
@@ -226,7 +226,7 @@
var/total_cash = 0
var/list/counted_money = list()
for(var/obj/item/weapon/coin/C in mover.GetAllContents())
for(var/obj/item/coin/C in mover.GetAllContents())
total_cash += C.value
counted_money += C
if(total_cash >= threshold)
code/modules/shuttle/supply.dm
+1 -1
View File
@@ -3,7 +3,7 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list(
/obj/structure/blob,
/obj/effect/rune,
/obj/structure/spider/spiderling,
/obj/item/weapon/disk/nuclear,
/obj/item/disk/nuclear,
/obj/machinery/nuclearbomb,
/obj/item/device/radio/beacon,
/obj/singularity,
code/modules/shuttle/syndicate.dm
+2 -2
View File
@@ -2,7 +2,7 @@
/obj/machinery/computer/shuttle/syndicate
name = "syndicate shuttle terminal"
circuit = /obj/item/weapon/circuitboard/computer/syndicate_shuttle
circuit = /obj/item/circuitboard/computer/syndicate_shuttle
icon_screen = "syndishuttle"
icon_keyboard = "syndie_key"
light_color = LIGHT_COLOR_RED
@@ -18,7 +18,7 @@
/obj/machinery/computer/shuttle/syndicate/Topic(href, href_list)
if(href_list["move"])
var/obj/item/weapon/circuitboard/computer/syndicate_shuttle/board = circuit
var/obj/item/circuitboard/computer/syndicate_shuttle/board = circuit
if(board.challenge && world.time < SYNDICATE_CHALLENGE_TIMER)
to_chat(usr, "<span class='warning'>You've issued a combat challenge to the station! You've got to give them at least [round(((SYNDICATE_CHALLENGE_TIMER - world.time) / 10) / 60)] more minutes to allow them to prepare.</span>")
return 0
code/modules/shuttle/white_ship.dm
+1 -1
View File
@@ -1,6 +1,6 @@
/obj/machinery/computer/shuttle/white_ship
name = "White Ship Console"
desc = "Used to control the White Ship."
circuit = /obj/item/weapon/circuitboard/computer/white_ship
circuit = /obj/item/circuitboard/computer/white_ship
shuttleId = "whiteship"
possible_destinations = "whiteship_away;whiteship_home;whiteship_z4;whiteship_lavaland"