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-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13183 from SmArtKar/shuttle_hotfix

Browse Source 
Shuttle hotfix so now you can make huge shuttle things
This commit is contained in:
silicons
2020-08-19 21:03:58 -07:00
committed by GitHub
parent 0e2e4fdaf7 e087845745
commit 91484356c5
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/controllers/configuration/entries/game_options.dm
View File

@@ -534,4 +534,4 @@
config_entry_value = 6 config_entry_value = 6
/datum/config_entry/number/max_shuttle_size /datum/config_entry/number/max_shuttle_size
config_entry_value = 250 config_entry_value = 500

9
code/modules/shuttle/shuttle_creation/shuttle_creator.dm
View File

@@ -43,6 +43,7 @@ GLOBAL_LIST_EMPTY(custom_shuttle_machines) //Machines that require updating (He
. = ..() . = ..()
internal_shuttle_creator = new() internal_shuttle_creator = new()
internal_shuttle_creator.owner_rsd = src internal_shuttle_creator.owner_rsd = src
desc += " Attention, the max size of the shuttle is [SHUTTLE_CREATOR_MAX_SIZE]."
overlay_holder = new() overlay_holder = new()
/obj/item/shuttle_creator/Destroy() /obj/item/shuttle_creator/Destroy()
@@ -237,13 +238,13 @@ GLOBAL_LIST_EMPTY(custom_shuttle_machines) //Machines that require updating (He
port.register() port.register()
icon_state = "rsd_used" icon_state = "rsd_empty"
//Clear highlights //Clear highlights
overlay_holder.clear_highlights() overlay_holder.clear_highlights()
GLOB.custom_shuttle_count ++ GLOB.custom_shuttle_count ++
message_admins("[ADMIN_LOOKUPFLW(user)] created a new shuttle with a [src] at [ADMIN_VERBOSEJMP(user)] ([GLOB.custom_shuttle_count] custom shuttles, limit is [CUSTOM_SHUTTLE_LIMIT])") message_admins("[ADMIN_LOOKUPFLW(user)] created a new shuttle with a [src] at [ADMIN_VERBOSEJMP(user)] ([GLOB.custom_shuttle_count] custom shuttles)")
log_game("[key_name(user)] created a new shuttle with a [src] at [AREACOORD(user)] ([GLOB.custom_shuttle_count] custom shuttles, limit is [CUSTOM_SHUTTLE_LIMIT])") log_game("[key_name(user)] created a new shuttle with a [src] at [AREACOORD(user)] ([GLOB.custom_shuttle_count] custom shuttles)")
return TRUE return TRUE
/obj/item/shuttle_creator/proc/create_shuttle_area(mob/user) /obj/item/shuttle_creator/proc/create_shuttle_area(mob/user)
@@ -350,7 +351,7 @@ GLOBAL_LIST_EMPTY(custom_shuttle_machines) //Machines that require updating (He
loggedOldArea = get_area(get_turf(user)) loggedOldArea = get_area(get_turf(user))
loggedTurfs |= turfs loggedTurfs |= turfs
overlay_holder.highlight_area(turfs) overlay_holder.highlight_area(turfs)
//TODO READD THIS SHIT: icon_state = "rsd_used" //TODO READD THIS SHIT: icon_state = "rsd_empty"
to_chat(user, "<span class='notice'>You add the area into the buffer of the [src], you made add more areas or select an airlock to act as a docking port to complete the shuttle.</span>") to_chat(user, "<span class='notice'>You add the area into the buffer of the [src], you made add more areas or select an airlock to act as a docking port to complete the shuttle.</span>")
return turfs return turfs