cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-30 08:39:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10732 from mwerezak/skipjack3

Browse Source 
Fixes #10723
This commit is contained in:
GinjaNinja32
2015-08-18 18:51:37 +01:00
parent b6ba94b256 b361f9ad12
commit 9f05c50a7c
5 changed files with 135 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/shuttle_controller.dm
+1 -1
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/skipjack_station)
VS.origin = locate(/area/skipjack_station/start)
VS.destinations = list(
"Fore Starboard Solars" = locate(/area/skipjack_station/northeast_solars),
code/game/antagonist/outsider/raider.dm
+1 -1
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/skipjack_station))
if(!player.current || get_area(player.current) != locate(/area/skipjack_station/start))
return 0
return 1
code/game/area/Space Station 13 areas.dm
+4 -1
View File
@@ -516,8 +516,11 @@ area/space/atmosalert()
icon_state = "yellow"
requires_power = 0
/area/skipjack_station/transit
/area/skipjack_station/start
name = "\improper Skipjack"
icon_state = "yellow"
/area/skipjack_station/transit
name = "\improper hyperspace"
icon_state = "shuttle"
code/game/gamemodes/objective.dm
+3 -3
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/skipjack_station/A = locate()
var/area/skipjack_station/start/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/skipjack_station))
for(var/obj/O in locate(/area/skipjack_station/start))
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/skipjack_station))
for(var/obj/item/O in locate(/area/skipjack_station/start))
var/obj/item/stack/material/S
if(istype(O,/obj/item/stack/material))