cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 06:22:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into placeholder

Browse Source
This commit is contained in:
Ferner
2021-02-23 20:20:58 +01:00
parent 4e4ad9881d a8a7dfb2e4
commit d0028a1e06
51 changed files with 253 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/radio/encryptionkey.dm
+2 -2
View File
@@ -108,7 +108,7 @@
/obj/item/device/encryptionkey/heads/captain
name = "captain's encryption key"
icon_state = "cap_cypherkey"
channels = list(CHANNEL_COMMAND = TRUE, CHANNEL_SECURITY = TRUE, CHANNEL_PENAL = TRUE, CHANNEL_ENGINEERING = FALSE, CHANNEL_SCIENCE = FALSE, CHANNEL_MEDICAL = FALSE, CHANNEL_SUPPLY = FALSE, CHANNEL_SERVICE = FALSE)
channels = list(CHANNEL_COMMAND = TRUE, CHANNEL_SECURITY = TRUE, CHANNEL_PENAL = TRUE, CHANNEL_ENGINEERING = TRUE, CHANNEL_SCIENCE = TRUE, CHANNEL_MEDICAL = TRUE, CHANNEL_SUPPLY = TRUE, CHANNEL_SERVICE = TRUE)
/obj/item/device/encryptionkey/heads/ai_integrated
name = "ai integrated encryption key"
@@ -139,7 +139,7 @@
/obj/item/device/encryptionkey/heads/hop
name = "head of personnel's encryption key"
icon_state = "hop_cypherkey"
channels = list(CHANNEL_SUPPLY = TRUE, CHANNEL_SERVICE = TRUE, CHANNEL_COMMAND = TRUE, CHANNEL_SECURITY = FALSE, CHANNEL_PENAL = FALSE)
channels = list(CHANNEL_SUPPLY = TRUE, CHANNEL_SERVICE = TRUE, CHANNEL_COMMAND = TRUE, CHANNEL_SECURITY = TRUE, CHANNEL_PENAL = TRUE)
/obj/item/device/encryptionkey/headset_cargo
name = "supply radio encryption key"
code/game/objects/items/glassjar.dm
+10
View File
@@ -100,6 +100,16 @@
update_icon()
return
/obj/item/glass_jar/MouseDrop(atom/over)
if(usr != over || use_check_and_message(usr))
return
if(length(contained))
switch(contains)
if(JAR_GUMBALL)
release(contained[1], usr)
usr.put_in_hands(contained[1])
contained -= contained[1]
/obj/item/glass_jar/attackby(var/atom/A, var/mob/user, var/proximity)
if(istype(A, /obj/item/spacecash))
var/obj/item/spacecash/S = A
code/game/objects/items/weapons/stunbaton.dm
+1 -1
View File
@@ -188,7 +188,7 @@
L.visible_message("<span class='danger'>[L] has been prodded with \the [src] by [user]!</span>")
//stun effects
L.stun_effect_act(stun, agony, target_zone, src)
L.stun_effect_act(stun, agony, used_weapon = src, damage_flags = DAM_DISPERSED)
playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1)