cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Job rank and radio channel rework (#8965)

Browse Source 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2
2024-09-17 12:24:13 -07:00
committed by GitHub
parent 6159cecfc8
commit 4153768ba1
444 changed files with 3341 additions and 2440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modular_chomp/code/datums/components/orbiter.dm
View File

@@ -99,13 +99,6 @@
if(!refreshing && !length(orbiters) && !QDELING(src))
qdel(src)
/datum/component/orbiter/proc/stop_all()
var/atom/master = parent
master.orbiters = null
for(var/i in orbiters)
end_orbit(i)
orbiters = null
// This proc can receive signals by either the thing being directly orbited or anything holding it
/datum/component/orbiter/proc/move_react(atom/orbited, atom/oldloc, direction)
set waitfor = FALSE // Transfer calls this directly and it doesnt care if the ghosts arent done moving

2
modular_chomp/code/datums/outfits/jobs/cargo.dm
View File

@@ -1,5 +1,5 @@
/decl/hierarchy/outfit/job/cargo/cargo_tech/mailman
name = OUTFIT_JOB_NAME("Mailman")
name = OUTFIT_JOB_NAME(JOB_ALT_MAILMAN)
uniform = /obj/item/clothing/under/rank/mailman2
head = /obj/item/clothing/head/mailman2
pda_slot = slot_l_store

2
modular_chomp/code/game/jobs/job/captain.dm
View File

@@ -1,3 +1,3 @@
/datum/alt_title/bridge_officer
title = "Bridge Officer"
title = JOB_ALT_BRIDGE_OFFICER
title_outfit = /decl/hierarchy/outfit/job/bridge_officer

1
modular_chomp/code/game/objects/items/weapons/id_cards.dm
View File

@@ -3,6 +3,7 @@
var/mob/living/silicon/robot/R
var/last_robot_loc
name = "Robot Exploration ID"
rank = JOB_EXPLORER
/obj/item/weapon/card/id/exploration/borg/Initialize()
. = ..()

2
modular_chomp/code/modules/client/preference_setup/loadout/loadout_suit.dm
View File

@@ -1,7 +1,7 @@
/datum/gear/suit/pcarrier // No protection until inserted with plates, purely for cosmetic purposes.
display_name = "Plate Carrier selection"
path = /obj/item/clothing/suit/armor/pcarrier
allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Pathfinder", "Field Medic", "Pilot", "Explorer")
allowed_roles = list(JOB_HEAD_OF_SECURITY, JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER, JOB_PATHFINDER, JOB_FIELD_MEDIC, JOB_PILOT, JOB_EXPLORER)
cost = 2
/datum/gear/suit/pcarrier/New()

2
modular_chomp/code/modules/mob/dead/observer/observer.dm
View File

@@ -62,7 +62,7 @@
avatar.regenerate_icons()
avatar.update_transform()
job_master.EquipRank(avatar,"VR Avatar", 1, FALSE)
job_master.EquipRank(avatar,JOB_VR, 1, FALSE) //CHOMPEdit
add_verb(avatar,/mob/living/carbon/human/proc/fake_exit_vr) //CHOMPEdit
add_verb(avatar,/mob/living/carbon/human/proc/vr_transform_into_mob) //CHOMPEdit
add_verb(avatar,/mob/living/proc/set_size) //CHOMPEdit TGPanel // Introducing NeosVR