Misc bug fixes #1 (#3135)

* safety updatesa

* multiple bugfixes

* Update synth_emotes.dm

* Update synth_emotes.dm
This commit is contained in:
Gandalf
2021-02-06 14:27:11 +00:00
committed by GitHub
parent 7acbd68644
commit 4d6bfd4355
6 changed files with 102 additions and 24 deletions
+2 -2
View File
@@ -84,9 +84,9 @@
var/obj/item/gun/G = get_active_held_item()
if(G.has_gun_safety)
if(combat_mode)
G.toggle_safety(src, FALSE)
G.toggle_safety(src, "off")
else
G.toggle_safety(src, TRUE)
G.toggle_safety(src, "on")
if(!ishuman(src))
if(combat_mode)
set_combat_indicator(TRUE)
@@ -1,3 +1,4 @@
/* SKYRAT EDIT REMOVAL
/datum/emote/silicon
mob_type_allowed_typecache = list(/mob/living/silicon)
emote_type = EMOTE_AUDIBLE
@@ -56,3 +57,4 @@
message = "blares an alarm!"
emote_type = EMOTE_AUDIBLE
sound = 'sound/machines/warning-buzzer.ogg'
*/