Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into izac-voreupdate

This commit is contained in:
izac112
2020-05-11 20:07:45 +02:00
5 changed files with 128838 additions and 70464 deletions
+3 -2
View File
@@ -25,10 +25,11 @@
supervisors = "the head of security"
selection_color = "#601C1C"
economic_modifier = 5
access = list(access_security, access_eva, access_sec_doors, access_brig, access_maint_tunnels, access_morgue, access_external_airlocks, access_secpilot)
minimal_access = list(access_security, access_eva, access_sec_doors, access_brig, access_maint_tunnels, access_external_airlocks, access_secpilot)
access = list(access_security, access_eva, access_sec_doors, access_brig, access_maint_tunnels, access_morgue, access_external_airlocks, access_secpilot, access_pilot)
minimal_access = list(access_security, access_eva, access_sec_doors, access_brig, access_maint_tunnels, access_external_airlocks, access_secpilot, access_pilot)
minimal_player_age = 7
outfit_type = /decl/hierarchy/outfit/job/security/pilot
pto_type = PTO_SECURITY
job_description = "Tasked with flying, operating, and sometimes even maintaining small spacecraft and personal exosuits such as the Durand or Gygax, \
Security Pilots are responsible for transporting criminals to more permanent holding facilities, and patrolling \
@@ -67,6 +67,7 @@
/obj/item/clothing/head/soft/sec/corp,
/obj/item/clothing/accessory/holster/armpit,
/obj/item/weapon/gun/energy/taser,
/obj/item/weapon/melee/baton/loaded,
/obj/item/weapon/cell/device/weapon,
/obj/item/device/flashlight/maglight,
/obj/item/device/radio
+128361 -6415
View File
File diff suppressed because it is too large Load Diff
+8 -1
View File
@@ -3,12 +3,19 @@
desc = "Home to sand and rocks."
icon_state = "globe"
color = "#ffd300" //Sandy
initial_generic_waypoints = list("borealis1_landing")
initial_generic_waypoints = list(
"borealis1_landing",
"borealis1_landing_backup"
)
/obj/effect/shuttle_landmark/premade/borealis1_landing
name = "Borealis 1 Landing Pad"
landmark_tag = "borealis1_landing"
/obj/effect/shuttle_landmark/premade/borealis1_landing_backup
name = "Borealis 1 Backup Landing Pad"
landmark_tag = "borealis1_landing_backup"
//This is a special subtype of the thing that generates ores on a map
//It will generate more rich ores because of the lower numbers than the normal one
/datum/random_map/noise/ore/beachmine
File diff suppressed because it is too large Load Diff