cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-02 21:42:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #10680

Browse Source
This commit is contained in:
mwerezak
2015-08-16 14:23:37 -04:00
parent f0c9f16099
commit 7c8c42137e
5 changed files with 116 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/controllers/shuttle_controller.dm
View File

@@ -203,7 +203,7 @@ var/global/datum/shuttle_controller/shuttle_controller
//Skipjack.
var/datum/shuttle/multi_shuttle/VS = new/datum/shuttle/multi_shuttle()
VS.origin = locate(/area/shuttle/skipjack/station)
VS.origin = locate(/area/skipjack_station)
VS.destinations = list(
"Fore Starboard Solars" = locate(/area/skipjack_station/northeast_solars),

2
code/game/antagonist/outsider/raider.dm
View File

@@ -184,7 +184,7 @@ var/datum/antagonist/raider/raiders
return 0
for(var/datum/mind/player in current_antagonists)
if(!player.current || get_area(player.current) != locate(/area/shuttle/skipjack/station))
if(!player.current || get_area(player.current) != locate(/area/skipjack_station))
return 0
return 1

10
code/game/area/Space Station 13 areas.dm
View File

@@ -319,11 +319,6 @@ area/space/atmosalert()
/area/shuttle/research/outpost
icon_state = "shuttle"
/area/shuttle/skipjack/station
name = "\improper Skipjack"
icon_state = "yellow"
requires_power = 0
/area/airtunnel1/ // referenced in airtunnel.dm:759
/area/dummy/ // Referenced in engine.dm:261
@@ -516,6 +511,11 @@ area/space/atmosalert()
requires_power = 0
lighting_use_dynamic = 0
/area/skipjack_station
name = "\improper Skipjack"
icon_state = "yellow"
requires_power = 0
/area/skipjack_station/transit
name = "\improper hyperspace"

6
code/game/gamemodes/objective.dm
View File

@@ -728,7 +728,7 @@ datum/objective/heist/kidnap
//if (!target.current.restrained())
// return 0 // They're loose. Close but no cigar.
var/area/shuttle/skipjack/station/A = locate()
var/area/skipjack_station/A = locate()
for(var/mob/living/carbon/human/M in A)
if(target.current == M)
return 1 //They're restrained on the shuttle. Success.
@@ -779,7 +779,7 @@ datum/objective/heist/loot
var/total_amount = 0
for(var/obj/O in locate(/area/shuttle/skipjack/station))
for(var/obj/O in locate(/area/skipjack_station))
if(istype(O,target)) total_amount++
for(var/obj/I in O.contents)
if(istype(I,target)) total_amount++
@@ -828,7 +828,7 @@ datum/objective/heist/salvage
var/total_amount = 0
for(var/obj/item/O in locate(/area/shuttle/skipjack/station))
for(var/obj/item/O in locate(/area/skipjack_station))
var/obj/item/stack/material/S
if(istype(O,/obj/item/stack/material))