cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 20:16:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Alters Command access to include weapons permits + Telebatons are now weapons (#24621)

Browse Source 
* beepsy nooo

* Update code/game/objects/items/weapons/batons.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/items/weapons/batons.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
This commit is contained in:
Marm
2024-03-16 16:14:43 +00:00
committed by GitHub
co-authored by Henri215
parent a65809e32f
commit b703a52294
6 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/jobs/job/engineering_jobs.dm
+1 -1
View File
@@ -13,7 +13,7 @@
access = list(ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS,
ACCESS_TELEPORTER, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_ATMOSPHERICS, ACCESS_EMERGENCY_STORAGE, ACCESS_EVA,
ACCESS_HEADS, ACCESS_CONSTRUCTION, ACCESS_SEC_DOORS,
ACCESS_CE, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_MINISAT, ACCESS_MINERAL_STOREROOM)
ACCESS_CE, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_MINISAT, ACCESS_MINERAL_STOREROOM, ACCESS_WEAPONS)
minimal_player_age = 21
exp_map = list(EXP_TYPE_ENGINEERING = 1200)
blacklisted_disabilities = list(DISABILITY_FLAG_BLIND, DISABILITY_FLAG_DEAF, DISABILITY_FLAG_MUTE, DISABILITY_FLAG_DIZZY, DISABILITY_FLAG_NERVOUS, DISABILITY_FLAG_LISP)
code/game/jobs/job/medical_jobs.dm
+2 -1
View File
@@ -26,7 +26,8 @@
ACCESS_RC_ANNOUNCE,
ACCESS_SEC_DOORS,
ACCESS_SURGERY,
ACCESS_VIROLOGY
ACCESS_VIROLOGY,
ACCESS_WEAPONS
)
minimal_player_age = 21
exp_map = list(EXP_TYPE_MEDICAL = 1200)
code/game/jobs/job/science_jobs.dm
+2 -1
View File
@@ -33,7 +33,8 @@
ACCESS_TOX_STORAGE,
ACCESS_TOX,
ACCESS_XENOARCH,
ACCESS_XENOBIOLOGY
ACCESS_XENOBIOLOGY,
ACCESS_WEAPONS
)
minimal_player_age = 21
blacklisted_disabilities = list(DISABILITY_FLAG_BLIND, DISABILITY_FLAG_DEAF, DISABILITY_FLAG_MUTE, DISABILITY_FLAG_DIZZY)
code/game/jobs/job/supervisor.dm
+2 -1
View File
@@ -282,7 +282,8 @@
ACCESS_MAINT_TUNNELS,
ACCESS_RC_ANNOUNCE,
ACCESS_SEC_DOORS,
ACCESS_SECURITY
ACCESS_SECURITY,
ACCESS_WEAPONS
)
blacklisted_disabilities = list(DISABILITY_FLAG_DEAF, DISABILITY_FLAG_MUTE, DISABILITY_FLAG_NERVOUS, DISABILITY_FLAG_LISP)
outfit = /datum/outfit/job/judge
code/game/jobs/job/support.dm
+1
View File
@@ -27,6 +27,7 @@
ACCESS_RC_ANNOUNCE,
ACCESS_SEC_DOORS,
ACCESS_SUPPLY_SHUTTLE,
ACCESS_WEAPONS
)
blacklisted_disabilities = list(DISABILITY_FLAG_BLIND, DISABILITY_FLAG_DEAF, DISABILITY_FLAG_MUTE, DISABILITY_FLAG_DIZZY)
outfit = /datum/outfit/job/qm
code/game/objects/items/weapons/batons.dm
-2
View File
@@ -143,7 +143,6 @@
desc = "A cane with special engraving on it. It seems well suited for fending off assailants..."
icon_state = "cane_nt"
item_state = "cane_nt"
needs_permit = FALSE
/obj/item/melee/classic_baton/ntcane/get_crutch_efficiency()
return 2
@@ -158,7 +157,6 @@
item_state = null
slot_flags = SLOT_FLAG_BELT
w_class = WEIGHT_CLASS_SMALL
needs_permit = FALSE
on = FALSE
/// Force when concealed
var/force_off = 0