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

Guns in holsters/bags keep their safety icon (#8308)

Browse Source
This commit is contained in:
mikomyazaki
2020-02-19 17:28:09 +00:00
committed by GitHub
parent 8bcf5cd89d
commit cbb94e74f8
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/projectiles/gun.dm
View File

@@ -128,7 +128,7 @@
var/image/gun_overlay = I var/image/gun_overlay = I
if(gun_overlay.icon == gun_gui_icons && dd_hasprefix(gun_overlay.icon_state, "[safety_icon]")) if(gun_overlay.icon == gun_gui_icons && dd_hasprefix(gun_overlay.icon_state, "[safety_icon]"))
overlays -= gun_overlay overlays -= gun_overlay
if(ismob(loc)) if(!isturf(loc)) // In a mob, holster or bag or something
overlays += image(gun_gui_icons,"[safety_icon][safety()]") overlays += image(gun_gui_icons,"[safety_icon][safety()]")
//Checks whether a given mob can use the gun //Checks whether a given mob can use the gun

6
html/changelogs/holstered_safeties.yml Normal file
View File

@@ -0,0 +1,6 @@
author: mikomyazaki
delete-after: True
changes:
- bugfix: "Holstered guns keep their safety icons."