Skip to content

Commit

Permalink
Backspaced out old dna lock system from guns (#6634)
Browse files Browse the repository at this point in the history
  • Loading branch information
silicons authored Jul 31, 2024
1 parent c377ae9 commit 0e1d9de
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 153 deletions.
1 change: 0 additions & 1 deletion citadel.dme
Original file line number Diff line number Diff line change
Expand Up @@ -4292,7 +4292,6 @@
#include "code\modules\preferences\preference_setup\vore\08_traits.dm"
#include "code\modules\preferences\preference_setup\vore\09_nif.dm"
#include "code\modules\preferences\preference_setup\vore\10_misc.dm"
#include "code\modules\projectiles\dnalocking.dm"
#include "code\modules\projectiles\gun.dm"
#include "code\modules\projectiles\pins.dm"
#include "code\modules\projectiles\projectile.dm"
Expand Down
88 changes: 0 additions & 88 deletions code/modules/projectiles/dnalocking.dm

This file was deleted.

60 changes: 0 additions & 60 deletions code/modules/projectiles/gun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,6 @@
/// whether or not we have safeties and if safeties are on
var/safety_state = GUN_SAFETY_ON

var/dna_lock = 0 //whether or not the gun is locked to dna
var/obj/item/dnalockingchip/attached_lock

var/last_shot = 0 //records the last shot fired

var/charge_sections = 4
Expand Down Expand Up @@ -147,13 +144,6 @@
if(isnull(scoped_accuracy))
scoped_accuracy = accuracy

if(dna_lock)
attached_lock = new /obj/item/dnalockingchip(src)
if(!dna_lock)
remove_obj_verb(src, /obj/item/gun/verb/remove_dna)
remove_obj_verb(src, /obj/item/gun/verb/give_dna)
remove_obj_verb(src, /obj/item/gun/verb/allow_dna)

if(pin)
pin = new pin(src)

Expand Down Expand Up @@ -201,21 +191,6 @@
return 0

var/mob/living/M = user
if(dna_lock && attached_lock.stored_dna)
if(!authorized_user(user))
if(attached_lock.safety_level == 0)
to_chat(M, "<span class='danger'>\The [src] buzzes in dissapointment and displays an invalid DNA symbol.</span>")
return 0
if(!attached_lock.exploding)
if(attached_lock.safety_level == 1)
to_chat(M, "<span class='danger'>\The [src] hisses in dissapointment.</span>")
visible_message("<span class='game say'><span class='name'>\The [src]</span> announces, \"Self-destruct occurring in ten seconds.\"</span>", "<span class='game say'><span class='name'>\The [src]</span> announces, \"Self-destruct occurring in ten seconds.\"</span>")
attached_lock.exploding = 1
spawn(100)
explosion(src, 0, 0, 3, 4)
sleep(1)
qdel(src)
return 0
if(MUTATION_HULK in M.mutations)
to_chat(M, "<span class='danger'>Your fingers are much too large for the trigger guard!</span>")
return 0
Expand Down Expand Up @@ -282,35 +257,6 @@
return ..() //Pistolwhippin'

/obj/item/gun/attackby(obj/item/A, mob/user)
if(istype(A, /obj/item/dnalockingchip))
if(dna_lock)
to_chat(user, "<span class='notice'>\The [src] already has a [attached_lock].</span>")
return
if(!user.attempt_insert_item_for_installation(A, src))
return
to_chat(user, "<span class='notice'>You insert \the [A] into \the [src].</span>")
attached_lock = A
dna_lock = 1
add_obj_verb(src, /obj/item/gun/verb/remove_dna)
add_obj_verb(src, /obj/item/gun/verb/give_dna)
add_obj_verb(src, /obj/item/gun/verb/allow_dna)
return

if(A.is_screwdriver())
if(dna_lock && attached_lock && !attached_lock.controller_lock)
to_chat(user, "<span class='notice'>You begin removing \the [attached_lock] from \the [src].</span>")
playsound(src, A.tool_sound, 50, 1)
if(do_after(user, 25 * A.tool_speed))
to_chat(user, "<span class='notice'>You remove \the [attached_lock] from \the [src].</span>")
user.put_in_hands(attached_lock)
dna_lock = 0
attached_lock = null
remove_obj_verb(src, /obj/item/gun/verb/remove_dna)
remove_obj_verb(src, /obj/item/gun/verb/give_dna)
remove_obj_verb(src, /obj/item/gun/verb/allow_dna)
else
to_chat(user, "<span class='warning'>\The [src] is not accepting modifications at this time.</span>")

if(A.is_multitool())
if(!scrambled)
to_chat(user, "<span class='notice'>You begin scrambling \the [src]'s electronic pins.</span>")
Expand Down Expand Up @@ -357,12 +303,6 @@
..()

/obj/item/gun/emag_act(var/remaining_charges, var/mob/user)
if(dna_lock && attached_lock.controller_lock)
to_chat(user, "<span class='notice'>You short circuit the internal locking mechanisms of \the [src]!</span>")
attached_lock.controller_dna = null
attached_lock.controller_lock = 0
attached_lock.stored_dna = list()
return 1
if(pin)
pin.emag_act(remaining_charges, user)

Expand Down
2 changes: 0 additions & 2 deletions code/modules/projectiles/guns/magnetic/magnetic_railgun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,6 @@
/obj/item/gun/magnetic/railgun/heater/pistol/hos
name = "prototype peacemaker"

dna_lock = TRUE

description_antag = "This weapon starts with a DNA locking chip attached. Using an EMAG on the weapon will disarm it, and allow you to use the chip as your own."

firemodes = list(
Expand Down
2 changes: 0 additions & 2 deletions code/modules/vore/fluffstuff/guns/dominator.dm
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@

modifystate = "dominatorstun"

dna_lock = 1

firemodes = list(
list(mode_name="stun", charge_cost=240,projectile_type=/obj/projectile/beam/stun, modifystate="dominatorstun", fire_sound='sound/weapons/Taser.ogg'),
list(mode_name="lethal", charge_cost=480,projectile_type=/obj/projectile/beam/dominator, modifystate="dominatorkill", fire_sound='sound/weapons/gauss_shoot.ogg'),
Expand Down

0 comments on commit 0e1d9de

Please sign in to comment.