cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 14:31:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Kataphract Ship - Giga Fix Collection (#14876)

Browse Source
This commit is contained in:
WickedCybs
2022-09-29 18:41:42 +02:00
committed by GitHub
parent c15d545f4b
commit 7a8bca59e2
7 changed files with 1843 additions and 1248 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/jobs/access_datum.dm
-10
View File
@@ -534,16 +534,6 @@ var/const/access_kataphract_knight = 114
id = access_kataphract_knight
desc = "Kataphract Knight Access"
var/const/access_kataphract_quartermaster = 115
/datum/access/kataphract/quartermaster
id = access_kataphract_quartermaster
desc = "Kataphract Quartermaster Access"
var/const/access_kataphract_trader = 116
/datum/access/kataphract/trader
id = access_kataphract_trader
desc = "Kataphract Trader Access"
/***************
* Antag access *
***************/
code/game/machinery/doors/firedoor.dm
+3
View File
@@ -497,6 +497,9 @@
if(do_set_light)
set_light(2, 0.5, COLOR_SUN)
/obj/machinery/door/firedoor/noid
req_one_access = null
//These are playing merry hell on ZAS. Sorry fellas :(
/*/obj/machinery/door/firedoor/border_only
code/modules/merchant/merchant_programs.dm
+2 -2
View File
@@ -10,8 +10,8 @@
size = 12
usage_flags = PROGRAM_CONSOLE
requires_access_to_run = PROGRAM_ACCESS_LIST_ONE
required_access_run = list(access_merchant, access_kataphract_trader)
required_access_download = list(access_merchant, access_kataphract_trader)
required_access_run = list(access_merchant)
required_access_download = list(access_merchant)
var/obj/machinery/merchant_pad/pad = null
var/current_merchant = 0
var/show_trades = 0
html/changelogs/wickedcybs_noid.yml
+16
View File
@@ -0,0 +1,16 @@
author: WickedCybs
delete-after: True
changes:
- tweak: "If venting happened, third parties wouldn't be able to use their emergency shutters to escape since it inherently has horizon engineering access required, which is ideally supposed to make it so non-engineers can't open the way into vented areas. Was rectified by adding a variant that needs no access to open. Every window and door has the proper type of emergency shutter now."
- rscadd: "Defined more areas for the kataphract ship since a lot of what was mapped in was pulling double duty for extra rooms. This would lead to some buggy and confusing interactions, especially for those far apart."
- tweak: "Lights in the kataship hangar were swapped for spotlights, as intended. Still looks the same, it just shines brighter."
- tweak: "Some of the air alarms still had engineering access requirements, which was hopefully fixed on a second pass and changed to kata id stuff instead."
- rscdel: "Removed the unused kata trader and quartermaster access types."
- tweak: "The kata ship docking airlock will actually start bolted now."
- tweak: "the kata ship airlock pumps will both cycle now instead of just one working."
- rscdel: "There were catwalks visible on the solars of the kataship when you look at the map using dream maker or strongdmm. These didn't spawn in the game itself as they weren't the interior type. Removed those from the map file."
- tweak: "Moved the position of the kata shuttle's docking port controller, since it was positioned in a way that it would overlay over anything put on the table it was originally on."
- rscadd: "Added the missing air alarms and other minor atmos equipment where it was missing on the kataphract ship, like the janitorial room or the brig."
- tweak: "Fixes blastdoor orientations on the kata ship bridge and transport shuttle."
maps/away/ships/kataphracts/kataphract_areas.dm
+31 -11
View File
@@ -25,6 +25,14 @@
name = "Kataphract Chapter - Main Ring"
icon_state = "yellow"
/area/kataphract_chapter/aft_hall
name = "Kataphract Chapter - Aft Hall"
icon_state = "yellow"
/area/kataphract_chapter/entry
name = "Kataphract Chapter - Entry"
icon_state = "yellow"
/area/kataphract_chapter/medical
name = "Kataphract Chapter - Medicine Room"
icon_state = "law"
@@ -48,39 +56,51 @@
name = "Kataphract Chapter - Cafeteria"
icon_state = "kitchen"
/area/kataphract_chapter/brig
name = "Kataphract Chapter - Brig"
icon_state = "security"
/area/kataphract_chapter/engineering
name = "Kataphract Chapter - Engineering"
icon_state = "engineering_workshop"
ambience = AMBIENCE_ENGINEERING
/area/kataphract_chapter/port_solars_array
name = "Kataphract Chapter - Port solars Array"
icon_state = "engineering_workshop"
ambience = AMBIENCE_ENGINEERING
/area/kataphract_chapter/port_solars
name = "Kataphract Chapter - Port Solars"
icon_state = "panelsA"
ambience = AMBIENCE_ENGINEERING
/area/kataphract_chapter/port_solars_array
name = "Kataphract Chapter - Port solars Array"
icon_state = "panelsA"
ambience = AMBIENCE_SPACE
/area/kataphract_chapter/starboard_solars
name = "Kataphract Chapter - Starboard Solars"
icon_state = "panelsA"
ambience = AMBIENCE_SPACE
ambience = AMBIENCE_ENGINEERING
/area/kataphract_chapter/starboard_solars_array
name = "Kataphract Chapter - Starboard Solars Array"
icon_state = "engineering_workshop"
ambience = AMBIENCE_ENGINEERING
icon_state = "panelsA"
ambience = AMBIENCE_SPACE
/area/kataphract_chapter/trading_area
name = "Kataphract Chapter - Trading Area"
icon_state = "quartoffice"
/area/kataphract_chapter/propulsion
name = "Kataphract Chapter - Propulsion"
/area/kataphract_chapter/starboardpropulsion
name = "Kataphract Chapter - Starboard Propulsion"
icon_state = "engineering_workshop"
/area/kataphract_chapter/portpropulsion
name = "Kataphract Chapter - Starboard Propulsion"
icon_state = "engineering_workshop"
/area/kataphract_chapter/janitorial
name = "Kataphract Chapter - Janitorial"
icon_state = "janitor"
/area/kataphract_chapter/warehouse
name = "Kataphract Chapter - Warehouse"
icon_state = "quartstorage"
@@ -105,4 +125,4 @@
name = "\improper Kataphract Transport"
/area/shuttle/kataphract_shuttle/engine_compartment
name = "\improper Kataphract Transport Engine compartment"
name = "\improper Kataphract Transport Engine compartment"
maps/away/ships/kataphracts/kataphract_ship.dmm
+1788 -1216
View File
File diff suppressed because it is too large Load Diff
maps/away/ships/kataphracts/kataphract_ship_ghostroles.dm
+3 -9
View File
@@ -89,7 +89,7 @@
H.w_uniform.color = pick("#1f8c3c", "#ab7318", "#1846ba")
/datum/outfit/admin/kataphract/get_id_access()
return list(access_kataphract, access_kataphract_trader, access_external_airlocks)
return list(access_kataphract, access_external_airlocks)
/datum/outfit/admin/kataphract/klax
@@ -132,7 +132,7 @@
/datum/outfit/admin/kataphract/knight/get_id_access()
return list(access_kataphract, access_kataphract_knight, access_kataphract_quartermaster, access_kataphract_trader, access_external_airlocks)
return list(access_kataphract, access_kataphract_knight, access_external_airlocks)
/datum/outfit/admin/kataphract/quartermaster
name = "Kataphract Quartermaster"
@@ -140,10 +140,4 @@
back = /obj/item/storage/backpack/satchel/hegemony
/datum/outfit/admin/kataphract/quartermaster/get_id_access()
return list(access_kataphract, access_kataphract_quartermaster, access_kataphract_trader, access_external_airlocks)
/datum/outfit/admin/kataphract/trader // Unused from an old trimmed out ghostrole, but handy to have still
name = "Kataphract Trader"
/datum/outfit/admin/kataphract/trader/get_id_access()
return list(access_kataphract, access_kataphract_trader, access_external_airlocks)
return list(access_kataphract, access_kataphract_knight, access_external_airlocks)