cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-26 10:02:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removes Weapons (#7415)

Browse Source 
* Adds icon and hitsound where needed.

* Moves alt_attack to /obj/item and deletes weapons.dm

* Replaced /obj/item/weapon with /obj/item

* Fixes merge issues.

* Fix merge issues.
This commit is contained in:
Werner
2019-11-16 18:36:13 +01:00
committed by GitHub
parent 128ca2235b
commit af16a489a6
1123 changed files with 27193 additions and 27175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/admin/admin_attack_log.dm
View File

@@ -39,7 +39,7 @@ proc/admin_attacker_log_many_victims(var/mob/attacker, var/list/mob/victims, var
for(var/mob/victim in victims)
admin_attack_log(attacker, victim, attacker_message, victim_message, admin_message)
proc/admin_inject_log(mob/attacker, mob/victim, obj/item/weapon, reagents, temperature, amount_transferred, violent=0)
proc/admin_inject_log(mob/attacker, mob/victim, obj/item/I, reagents, temperature, amount_transferred, violent=0)
if(violent)
violent = "violently "
else
@@ -48,6 +48,6 @@ proc/admin_inject_log(mob/attacker, mob/victim, obj/item/weapon, reagents, tempe
var/temperature_text = "([temperature - (T0C + 20)]C)"
admin_attack_log(attacker,
victim,
"used \the [weapon] to [violent]inject - [reagents] [temperature_text] - [amount_transferred]u transferred",
"was [violent]injected with \the [weapon] - [reagents] [temperature_text] - [amount_transferred]u transferred",
"used \the [weapon] to [violent]inject [reagents] [temperature_text] ([amount_transferred]u transferred) into")
"used \the [I] to [violent]inject - [reagents] [temperature_text] - [amount_transferred]u transferred",
"was [violent]injected with \the [I] - [reagents] [temperature_text] - [amount_transferred]u transferred",
"used \the [I] to [violent]inject [reagents] [temperature_text] ([amount_transferred]u transferred) into")