Skip to content

Commit 1341dba

Browse files

File tree

8 files changed

+20
-1
lines changed

8 files changed

+20
-1
lines changed

code/modules/atmospherics/machinery/components/components_base.dm

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,3 +293,6 @@
293293

294294
/obj/machinery/atmospherics/components/update_layer()
295295
layer = initial(layer) + (piping_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_LCHANGE + (GLOB.pipe_colors_ordered[pipe_color] * 0.001)
296+
297+
/obj/machinery/atmospherics/components/container_resist_act(mob/living/user)
298+
INVOKE_ASYNC(user, TYPE_PROC_REF(/mob/living, handle_ventcrawl), src)

code/modules/jobs/job_types/_job.dm

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -582,6 +582,10 @@
582582
if(!GLOB.current_anonymous_theme && player_client.prefs.read_preference(/datum/preference/name/cyborg) != DEFAULT_CYBORG_NAME)
583583
apply_pref_name(/datum/preference/name/cyborg, player_client)
584584

585+
// monkestation edit start
586+
TryConnectToAI() // needs to happen before the client is transfered to the mob
587+
// monkestation edit end
588+
585589
/**
586590
* Called after a successful roundstart spawn.
587591
* Client is not yet in the mob.

code/modules/jobs/job_types/cyborg.dm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
spawned.gender = NEUTER
5353
var/mob/living/silicon/robot/robot_spawn = spawned
5454
robot_spawn.notify_ai(AI_NOTIFICATION_NEW_BORG)
55-
robot_spawn.TryConnectToAI()
5655
if(!robot_spawn.connected_ai) // Only log if there's no Master AI
5756
robot_spawn.log_current_laws()
5857
return TRUE

code/modules/mob/living/emote.dm

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -626,6 +626,8 @@ monkestation edit end */
626626
key = "me"
627627
key_third_person = "custom"
628628
message = null
629+
muzzle_ignore = TRUE // monkestation addition
630+
stat_allowed = SOFT_CRIT // monkestation addition
629631

630632
/datum/emote/living/custom/can_run_emote(mob/user, status_check, intentional)
631633
. = ..() && intentional

code/modules/projectiles/boxes_magazines/_box_magazine.dm

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,3 +216,7 @@
216216
/obj/item/ammo_box/magazine/handle_atom_del(atom/A)
217217
stored_ammo -= A
218218
update_ammo_count()
219+
220+
/obj/item/ammo_box/handle_atom_del(atom/A)
221+
stored_ammo.Remove(A)
222+
return ..()

code/modules/projectiles/guns/ballistic.dm

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -718,6 +718,11 @@ GLOBAL_LIST_INIT(gun_saw_types, typecacheof(list(
718718
chamber_round()
719719
update_appearance()
720720

721+
/obj/item/gun/ballistic/handle_atom_del(atom/A)
722+
if(istype(A, /obj/item/ammo_casing) && magazine)
723+
magazine.handle_atom_del(A)
724+
return ..()
725+
721726
/obj/item/suppressor
722727
name = "suppressor"
723728
desc = "A syndicate small-arms suppressor for maximum espionage."

monkestation/code/modules/emotes/code/emote.dm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -501,6 +501,7 @@
501501
/datum/emote/spin/speen
502502
key = "speen"
503503
key_third_person = "speens"
504+
message = "speens!"
504505
emote_type = EMOTE_VISIBLE | EMOTE_AUDIBLE
505506
mob_type_allowed_typecache = /mob/living
506507
mob_type_blacklist_typecache = list(/mob/living/brain)

monkestation/code/modules/security/code/weapons/lawbringer.dm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@
154154
owner_dna = null
155155
update_id(user)
156156
return TRUE
157+
return ..()
157158

158159
/obj/item/gun/energy/e_gun/lawbringer/attack_self(mob/living/user as mob)
159160
if(!iscarbon(user))

0 commit comments

Comments
 (0)