shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits

Browse Source
This commit is contained in:
Putnam3145
2022-05-17 13:22:40 -07:00
parent d5c36b4a99 35f86287e2
commit 33889870c9
1311 changed files with 12771 additions and 10321 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/shuttle/custom_shuttle.dm
+1 -1
View File
@@ -235,7 +235,7 @@
designate_time = 100
circuit = /obj/item/circuitboard/computer/shuttle/docker
/obj/machinery/computer/camera_advanced/shuttle_docker/custom/Initialize()
/obj/machinery/computer/camera_advanced/shuttle_docker/custom/Initialize(mapload)
. = ..()
GLOB.jam_on_wardec += src
code/modules/shuttle/emergency.dm
+1 -1
View File
@@ -630,7 +630,7 @@
height = 8
dir = EAST
/obj/docking_port/mobile/emergency/backup/Initialize()
/obj/docking_port/mobile/emergency/backup/Initialize(mapload)
// We want to be a valid emergency shuttle
// but not be the main one, keep whatever's set
// valid.
code/modules/shuttle/navigation_computer.dm
+1 -1
View File
@@ -22,7 +22,7 @@
var/turf/designating_target_loc
var/jammed = FALSE
/obj/machinery/computer/camera_advanced/shuttle_docker/Initialize()
/obj/machinery/computer/camera_advanced/shuttle_docker/Initialize(mapload)
. = ..()
GLOB.navigation_computers += src
whitelist_turfs = typecacheof(whitelist_turfs)
code/modules/shuttle/shuttle.dm
+1 -1
View File
@@ -281,7 +281,7 @@
var/area/shuttle/transit/assigned_area
var/obj/docking_port/mobile/owner
/obj/docking_port/stationary/transit/Initialize()
/obj/docking_port/stationary/transit/Initialize(mapload)
. = ..()
SSshuttle.transit += src
code/modules/shuttle/shuttle_creation/shuttle_creator.dm
+2 -2
View File
@@ -24,7 +24,7 @@ GLOBAL_LIST_EMPTY(custom_shuttle_machines) //Machines that require updating (He
throw_range = 5
w_class = WEIGHT_CLASS_NORMAL
req_access_txt = "11"
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 50)
resistance_flags = FIRE_PROOF
var/ready = TRUE
//pre-designation
@@ -39,7 +39,7 @@ GLOBAL_LIST_EMPTY(custom_shuttle_machines) //Machines that require updating (He
//After designation
var/linkedShuttleId
/obj/item/shuttle_creator/Initialize()
/obj/item/shuttle_creator/Initialize(mapload)
. = ..()
internal_shuttle_creator = new()
internal_shuttle_creator.owner_rsd = src
code/modules/shuttle/shuttle_creation/shuttle_creator_eye.dm
+1 -1
View File
@@ -8,7 +8,7 @@
var/turf/source_turf
var/max_range = 12
/mob/camera/aiEye/remote/shuttle_creation/Initialize()
/mob/camera/aiEye/remote/shuttle_creation/Initialize(mapload)
. = ..()
setLoc(get_turf(source_turf))
code/modules/shuttle/spaceship_navigation_beacon.dm
+1 -1
View File
@@ -17,7 +17,7 @@
var/locked = FALSE //Locked beacons don't allow to jump to it.
/obj/machinery/spaceship_navigation_beacon/Initialize()
/obj/machinery/spaceship_navigation_beacon/Initialize(mapload)
. = ..()
SSshuttle.beacons |= src
code/modules/shuttle/special.dm
+5 -6
View File
@@ -15,7 +15,7 @@
var/list/active_tables = list()
var/tables_required = 2
/obj/machinery/power/emitter/energycannon/magical/Initialize()
/obj/machinery/power/emitter/energycannon/magical/Initialize(mapload)
. = ..()
if(prob(50))
desc = "Oh no, not again."
@@ -144,7 +144,7 @@
unique_name = FALSE // disables the (123) number suffix
initial_language_holder = /datum/language_holder/universal
/mob/living/simple_animal/drone/snowflake/bardrone/Initialize()
/mob/living/simple_animal/drone/snowflake/bardrone/Initialize(mapload)
. = ..()
access_card.access |= ACCESS_CENT_BAR
@@ -159,7 +159,7 @@
stop_automated_movement = TRUE
initial_language_holder = /datum/language_holder/universal
/mob/living/simple_animal/hostile/alien/maid/barmaid/Initialize()
/mob/living/simple_animal/hostile/alien/maid/barmaid/Initialize(mapload)
. = ..()
access_card = new /obj/item/card/id(src)
var/datum/job/captain/C = new /datum/job/captain
@@ -212,15 +212,14 @@
var/static/list/check_times = list()
/obj/effect/forcefield/luxury_shuttle/CanPass(atom/movable/mover, turf/target)
/obj/effect/forcefield/luxury_shuttle/CanAllowThrough(atom/movable/mover, turf/target)
. = ..()
if(mover in approved_passengers)
return TRUE
if(!isliving(mover)) //No stowaways
return FALSE
return FALSE
#define LUXURY_MESSAGE_COOLDOWN 100
/obj/effect/forcefield/luxury_shuttle/Bumped(atom/movable/AM)
code/modules/shuttle/supply.dm
+1 -1
View File
@@ -261,7 +261,7 @@ GLOBAL_LIST_INIT(cargo_shuttle_leave_behind_typecache, typecacheof(list(
matched_bounty = TRUE
// ignore mech checks because the mech is ONLY for bounty
continue
if(!AM.anchored || istype(AM, /obj/mecha))
if(!AM.anchored || istype(AM, /obj/vehicle/sealed/mecha))
export_item_and_contents(AM, export_categories , dry_run = FALSE, external_report = ex)
if(ex.exported_atoms)
code/modules/shuttle/white_ship.dm
+2 -2
View File
@@ -41,7 +41,7 @@
y_offset = 0
designate_time = 0
/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship/Initialize()
/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship/Initialize(mapload)
. = ..()
GLOB.jam_on_wardec += src
@@ -51,6 +51,6 @@
/obj/effect/spawner/lootdrop/whiteship_cere_ripley
name = "25% mech 75% wreckage ripley spawner"
loot = list(/obj/mecha/working/ripley/mining = 1,
loot = list(/obj/vehicle/sealed/mecha/working/ripley/mining = 1,
/obj/structure/mecha_wreckage/ripley = 5)
lootdoubles = FALSE