cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

REEEEEEEEEEEEEEEEELOADINGGGGGGGGGGGGGGGG (#9201)

Browse Source 
* REEEEEEEEEEEEEEEEELOADINGGGGGGGGGGGGGGGG

* Update ballistic.dm

* Update ballistic.dm

* Update ballistic.dm

* Update ballistic.dm

* Update ballistic.dm

* Update ballistic.dm

* Update ballistic.dm

* Update ballistic.dm

* Update ballistic.dm

* can_reload_say fix

* Update ballistic.dm

* Update ballistic.dm

* move countempties to ballistic so I can check for empty shells in magazines

* moved countempties in get_ammo to base ballistic

* want to fucking die

* Update ballistic.dm
This commit is contained in:
Theos
2020-07-25 10:53:14 -04:00
committed by GitHub
parent 25cc398ba4
commit 1463576bf0
2 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
code/modules/projectiles/guns/ballistic.dm
View File

@@ -87,6 +87,7 @@
var/tac_reloads = TRUE //Snowflake mechanic no more.
///Whether the gun can be sawn off by sawing tools
var/can_be_sawn_off = FALSE
var/reload_say = null
/obj/item/gun/ballistic/Initialize()
. = ..()
@@ -197,6 +198,8 @@
to_chat(user, "<span class='warning'>\The [AM] doesn't seem to fit into \the [src]...</span>")
return FALSE
if(user.transferItemToLoc(AM, src))
if(reload_say && AM.ammo_count() && !get_ammo(FALSE, FALSE))
user.say(reload_say, forced = "reloading")
magazine = AM
if (display_message)
to_chat(user, "<span class='notice'>You load a new [magazine_wording] into \the [src].</span>")
@@ -255,10 +258,13 @@
if (chambered && !chambered.BB)
chambered.forceMove(drop_location())
chambered = null
var/can_reload_say = !get_ammo(FALSE, FALSE)
var/num_loaded = magazine.attackby(A, user, params, TRUE)
if (num_loaded)
to_chat(user, "<span class='notice'>You load [num_loaded] [cartridge_wording]\s into \the [src].</span>")
playsound(src, load_sound, load_sound_volume, load_sound_vary)
if(can_reload_say)
user.say(reload_say, forced = "reloading")
if (chambered == null && bolt_type == BOLT_TYPE_NO_BOLT)
chamber_round()
A.update_icon()
@@ -382,13 +388,24 @@
if (suppressed)
. += "It has a suppressor attached that can be removed with <b>alt+click</b>."
///Gets the number of bullets in the gun
/obj/item/gun/ballistic/proc/get_ammo(countchambered = TRUE)
/obj/item/gun/ballistic/verb/set_reload()
set name = "Set Reload Speech"
set category = "Object"
set desc = "Activate to set what is said with the gun when tactically reloading."
if(usr.incapacitated())
return
var/input = stripped_input(usr,"What do you want to say when reloading with [src]? Cancel to disable reload speech.", ,reload_say, MAX_NAME_LEN)
input = replacetext(input, "*", "")
if(input)
reload_say = input
log_game("[usr] has set the reload speech on [src] to [reload_say]")
/obj/item/gun/ballistic/proc/get_ammo(countchambered = TRUE, countempties = TRUE)
var/boolets = 0 //mature var names for mature people
if (chambered && countchambered)
boolets++
if (magazine)
boolets += magazine.ammo_count()
boolets += magazine.ammo_count(countempties)
return boolets
///gets a list of every bullet in the gun