Just deleted about 400 bot accounts and a bunch of spam. To mitigate this in the future, we've enabled reCaptcha on signup. Let me know if someone got caught in the crossfire.

Commit f9110f06 authored by SonixApache's avatar SonixApache Committed by PJB3005
Browse files

Adds silencer compatibility to the NT USP (#13924)

* Adds silencer compatibility to the NT USP.

* remove conflict you are worst conflict
parent 15a59556
......@@ -113,6 +113,7 @@
/obj/item/weapon/gun/projectile/sec
name = "\improper NT USP"
desc = "The NT USP is a cheap, ubiquitous sidearm, produced by a NanoTrasen subsidiary. Uses .45 rounds."
icon = 'icons/obj/biggun.dmi' //for silencer compatibility
icon_state = "secguncomp"
ammo_type = "/obj/item/ammo_casing/c45"
mag_type = "/obj/item/ammo_storage/magazine/c45"
......@@ -121,10 +122,11 @@
origin_tech = Tc_COMBAT + "=3"
fire_sound = 'sound/weapons/semiauto.ogg'
load_method = 2
gun_flags = SILENCECOMP
/obj/item/weapon/gun/projectile/sec/update_icon()
..()
icon_state = "secguncomp[chambered ? "" : "-e"]"
icon_state = "secguncomp[silenced ? "-s" : ""][chambered ? "" : "-e"]"
/obj/item/weapon/gun/projectile/sec/fancy
desc = "The NT USP is a cheap, ubiquitous sidearm, produced by a NanoTrasen subsidiary. This one has a sweet pearl finish. Uses .45 rounds."
......@@ -133,4 +135,4 @@
/obj/item/weapon/gun/projectile/sec/fancy/update_icon()
..()
icon_state = "secgunfancy[chambered ? "" : "-e"]"
\ No newline at end of file
icon_state = "secguncompfancy[silenced ? "-s" : ""][chambered ? "" : "-e"]"
\ No newline at end of file
No preview for this file type
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment