cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-26 00:51:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #197 from NullDagaf/cummenfarten

Browse Source 
ech
This commit is contained in:
projectkepler-RU
2023-04-20 00:41:33 +07:00
committed by GitHub
parent e7eb758cb6 b7f18bc227
commit 05867699c5
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/game/objects/items/melee/baton.dm
View File

@@ -420,7 +420,7 @@
log_mapping("[src] at [AREACOORD(src)] had an invalid preload_cell_type: [preload_cell_type].")
else
cell = new preload_cell_type(src)
RegisterSignal(src, COMSIG_PARENT_ATTACKBY, .proc/convert)
RegisterSignal(src, COMSIG_PARENT_ATTACKBY, PROC_REF(convert))
update_appearance()
/obj/item/melee/baton/security/get_cell()
@@ -574,7 +574,7 @@
target.set_timed_status_effect(16 SECONDS, /datum/status_effect/speech/stutter, only_if_higher = TRUE)
SEND_SIGNAL(target, COMSIG_LIVING_MINOR_SHOCK)
addtimer(CALLBACK(src, .proc/apply_stun_effect_end, target), 2 SECONDS)
addtimer(CALLBACK(src, PROC_REF(apply_stun_effect_end), target), 2 SECONDS)
/// After the initial stun period, we check to see if the target needs to have the stun applied.
/obj/item/melee/baton/security/proc/apply_stun_effect_end(mob/living/target)
@@ -615,7 +615,7 @@
scramble_mode()
for(var/loops in 1 to rand(6, 12))
scramble_time = rand(5, 15) / (1 SECONDS)
addtimer(CALLBACK(src, .proc/scramble_mode), scramble_time*loops * (1 SECONDS))
addtimer(CALLBACK(src, PROC_REF(scramble_mode)), scramble_time*loops * (1 SECONDS))
/obj/item/melee/baton/security/proc/scramble_mode()
if (!cell || cell.charge < cell_hit_cost)

3
code/modules/jobs/job_types/warden.dm
View File

@@ -53,7 +53,6 @@
suit_store = /obj/item/gun/energy/disabler
backpack_contents = list(
/obj/item/evidencebag = 1,
/obj/item/modular_computer/pda/warden = 1,
/obj/item/flashlight/seclite = 1,
/obj/item/storage/box/gunset/glock17 = 1,
)
@@ -63,7 +62,7 @@
gloves = /obj/item/clothing/gloves/color/black/security //SKYRAT EDIT CHANGE - Original: /obj/item/clothing/gloves/color/black
head = /obj/item/clothing/head/hats/warden //SKYRAT EDIT CHANGE - Original: /obj/item/clothing/head/hats/warden/red
shoes = /obj/item/clothing/shoes/jackboots/sec
l_pocket = /obj/item/restraints/handcuffs
l_pocket = /obj/item/modular_computer/pda/warden
r_pocket = /obj/item/assembly/flash/handheld
backpack = /obj/item/storage/backpack/security

1
modular_zubbers/code/game/objects/items/holy_weapons.dm
View File

@@ -3,6 +3,7 @@
desc = "A staff used by traditional bishops and popes."
icon = 'modular_zubbers/icons/obj/items_and_weapons.dmi'
icon_state = "papal_staff"
worn_icon_state = "nullrod"
inhand_icon_state = "papal_staff"
lefthand_file = 'modular_zubbers/icons/mob/inhands/weapons/melee_lefthand.dmi'
righthand_file = 'modular_zubbers/icons/mob/inhands/weapons/melee_righthand.dmi'

2
modular_zubbers/code/modules/status_indicators/status_indicator.dm
View File

@@ -212,7 +212,7 @@ GLOBAL_LIST_INIT(potential_indicators, list(
/atom/movable/screen/plane_master/game_world_upper_fov_hidden/status_indicator
name = "Status Indicator Plane"
documentation = "Status Indicator Plane"
plane = GAME_PLANE_UPPER_FOV_HIDDEN
plane = PLANE_STATUS_INDICATOR
start_hidden = FALSE
#undef STATUS_INDICATOR_Y_OFFSET