cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-16 12:53:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4572 from Citadel-Station-13/upstream-merge-33807

Browse Source 
[MIRROR] Made atoms not smooth with shuttles
This commit is contained in:
LetterJay
2017-12-29 06:23:12 -06:00
committed by GitHub
parent 93914f2a31 cc2a18680d
commit b13d4dd721
3 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/__HELPERS/icon_smoothing.dm
View File

@@ -267,6 +267,13 @@
if(!target_turf) if(!target_turf)
return NULLTURF_BORDER return NULLTURF_BORDER
var/area/target_area = get_area(target_turf)
var/area/source_area = get_area(source)
if(source_area.canSmoothWithAreas && !is_type_in_typecache(target_area, source_area.canSmoothWithAreas))
return null
if(target_area.canSmoothWithAreas && !is_type_in_typecache(source_area, target_area.canSmoothWithAreas))
return null
if(source.canSmoothWith) if(source.canSmoothWith)
var/atom/A var/atom/A
if(source.smooth & SMOOTH_MORE) if(source.smooth & SMOOTH_MORE)

2
code/game/area/areas.dm
View File

@@ -62,6 +62,7 @@
var/list/firealarms var/list/firealarms
var/firedoors_last_closed_on = 0 var/firedoors_last_closed_on = 0
var/xenobiology_compatible = FALSE //Can the Xenobio management console transverse this area by default? var/xenobiology_compatible = FALSE //Can the Xenobio management console transverse this area by default?
var/list/canSmoothWithAreas //typecache to limit the areas that atoms in this area can smooth with
/*Adding a wizard area teleport list because motherfucking lag -- Urist*/ /*Adding a wizard area teleport list because motherfucking lag -- Urist*/
/*I am far too lazy to make it a proper list of areas so I'll just make it run the usual telepot routine at the start of the game*/ /*I am far too lazy to make it a proper list of areas so I'll just make it run the usual telepot routine at the start of the game*/
@@ -105,6 +106,7 @@ GLOBAL_LIST_EMPTY(teleportlocs)
uid = ++global_uid uid = ++global_uid
related = list(src) related = list(src)
map_name = name // Save the initial (the name set in the map) name of the area. map_name = name // Save the initial (the name set in the map) name of the area.
canSmoothWithAreas = typecacheof(canSmoothWithAreas)
if(requires_power) if(requires_power)
luminosity = 0 luminosity = 0

27
code/game/area/areas/shuttles.dm
View File

@@ -11,6 +11,11 @@
valid_territory = FALSE valid_territory = FALSE
icon_state = "shuttle" icon_state = "shuttle"
/area/shuttle/Initialize()
if(!canSmoothWithAreas)
canSmoothWithAreas = type
. = ..()
////////////////////////////Multi-area shuttles//////////////////////////// ////////////////////////////Multi-area shuttles////////////////////////////
////////////////////////////Syndicate infiltrator//////////////////////////// ////////////////////////////Syndicate infiltrator////////////////////////////
@@ -19,6 +24,7 @@
name = "Syndicate Infiltrator" name = "Syndicate Infiltrator"
blob_allowed = FALSE blob_allowed = FALSE
ambientsounds = HIGHSEC ambientsounds = HIGHSEC
canSmoothWithAreas = /area/shuttle/syndicate
/area/shuttle/syndicate/bridge /area/shuttle/syndicate/bridge
name = "Syndicate Infiltrator Control" name = "Syndicate Infiltrator Control"
@@ -37,6 +43,18 @@
/area/shuttle/syndicate/airlock /area/shuttle/syndicate/airlock
name = "Syndicate Infiltrator Airlock" name = "Syndicate Infiltrator Airlock"
////////////////////////////Pirate Shuttle////////////////////////////
/area/shuttle/pirate
name = "Pirate Shuttle"
blob_allowed = FALSE
requires_power = TRUE
canSmoothWithAreas = /area/shuttle/pirate
/area/shuttle/pirate/vault
name = "Pirate Shuttle Vault"
requires_power = FALSE
////////////////////////////Single-area shuttles//////////////////////////// ////////////////////////////Single-area shuttles////////////////////////////
/area/shuttle/transit /area/shuttle/transit
@@ -114,12 +132,3 @@
/area/shuttle/syndicate_scout /area/shuttle/syndicate_scout
name = "Syndicate Scout" name = "Syndicate Scout"
blob_allowed = FALSE blob_allowed = FALSE
/area/shuttle/pirate
name = "Pirate Shuttle"
blob_allowed = FALSE
requires_power = TRUE
/area/shuttle/pirate/vault
name = "Pirate Shuttle Vault"
requires_power = FALSE