cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-12 16:38:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1002 from DragonTrance/junior

Browse Source 
haha what if junior jobs got fixed
This commit is contained in:
QuoteFox
2021-02-27 06:20:37 +00:00
committed by GitHub
parent 683bbd7e23 e0961b1a2e
commit fed22c003f
6 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/job.dm
+1 -1
View File
@@ -395,7 +395,7 @@ SUBSYSTEM_DEF(job)
if(!joined_late)
var/obj/S = null
for(var/obj/effect/landmark/start/sloc in GLOB.start_landmarks_list)
if(sloc.name != rank)
if(sloc.name != rank && sloc.type != job.override_roundstart_spawn)
S = sloc //so we can revert to spawning them on top of eachother if something goes wrong
continue
if(locate(/mob/living) in sloc.loc)
code/modules/jobs/job_types/engineering.dm
+1 -6
View File
@@ -196,6 +196,7 @@ Junior Engineer
ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_ATMOSPHERICS, ACCESS_TCOMSAT, ACCESS_MINERAL_STOREROOM)
minimal_access = list(ACCESS_TECH_STORAGE, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_MAINT_TUNNELS,
ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_TCOMSAT, ACCESS_MINERAL_STOREROOM)
override_roundstart_spawn = /obj/effect/landmark/start/station_engineer
/datum/outfit/job/engineer/junior
name = "Engineering Intern"
@@ -228,9 +229,3 @@ Junior Engineer
suit_store = /obj/item/tank/internals/oxygen
head = null
internals_slot = SLOT_S_STORE
/datum/job/junior_engineer/after_spawn(mob/living/carbon/human/H, mob/M) //Instead of going through the process of adding spawnpoints
var/turf/T
var/spawn_point = locate(/obj/effect/landmark/start/station_engineer) in GLOB.start_landmarks_list
T = get_turf(spawn_point)
H.Move(T)
code/modules/jobs/job_types/job.dm
+2
View File
@@ -61,6 +61,8 @@
var/list/alt_titles = list()
var/override_roundstart_spawn = null //Where the player spawns at roundstart if defined
//Only override this proc
//H is usually a human unless an /equip override transformed it
/datum/job/proc/after_spawn(mob/living/H, mob/M, latejoin = FALSE)
code/modules/jobs/job_types/medical.dm
+1 -6
View File
@@ -243,6 +243,7 @@ Junior Doctor
access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MINERAL_STOREROOM)
minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CLONING, ACCESS_MINERAL_STOREROOM)
override_roundstart_spawn = /obj/effect/landmark/start/medical_doctor
/datum/outfit/job/doctor/junior
name = "Medical Resident"
@@ -261,9 +262,3 @@ Junior Doctor
duffelbag = /obj/item/storage/backpack/duffelbag/med
chameleon_extras = /obj/item/gun/syringe
/datum/job/junior_doctor/after_spawn(mob/living/carbon/human/H, mob/M) //Instead of going through the process of adding spawnpoints
var/turf/T
var/spawn_point = locate(/obj/effect/landmark/start/medical_doctor) in GLOB.start_landmarks_list
T = get_turf(spawn_point)
H.Move(T)
code/modules/jobs/job_types/science.dm
+1 -6
View File
@@ -160,6 +160,7 @@ Junior Scientist
access = list(ACCESS_ROBOTICS, ACCESS_RESEARCH, ACCESS_MINERAL_STOREROOM, ACCESS_TECH_STORAGE, ACCESS_GENETICS)
minimal_access = list(ACCESS_RESEARCH, ACCESS_MINERAL_STOREROOM)
override_roundstart_spawn = /obj/effect/landmark/start/scientist
/datum/outfit/job/scientist/junior
name = "Scientist"
@@ -173,9 +174,3 @@ Junior Scientist
backpack = /obj/item/storage/backpack/science
satchel = /obj/item/storage/backpack/satchel/tox
/datum/job/junior_scientist/after_spawn(mob/living/carbon/human/H, mob/M) //Instead of going through the process of adding spawnpoints
var/turf/T
var/spawn_point = locate(/obj/effect/landmark/start/scientist) in GLOB.start_landmarks_list
T = get_turf(spawn_point)
H.Move(T)
code/modules/jobs/job_types/security.dm
+1
View File
@@ -375,6 +375,7 @@ Junior Security Officer
mind_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM)
blacklisted_quirks = list(/datum/quirk/mute, /datum/quirk/nonviolent, /datum/quirk/paraplegic)
override_roundstart_spawn = /obj/effect/landmark/start/security_officer
/datum/job/junior_officer/get_access()