Skip to content

Commit

Permalink
KITCHEN GUN! (#37289)
Browse files Browse the repository at this point in the history
* KITCHEN GUN!

* fix

* sure, they can have it too

* possible fix, also nicer message

* now actually cleans!

* intense cleaning

* final thing that makes it work

* HI I'M DEREK BAUM

* clean_act() delets them anyways

* some extra mags for extra shots

* buffs price
  • Loading branch information
SECBATON-GRIFFON authored Oct 31, 2024
1 parent 03964b7 commit 993c7f0
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 0 deletions.
8 changes: 8 additions & 0 deletions code/datums/uplink_item.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1072,6 +1072,14 @@ var/list/discounted_items_of_the_round = list()
discounted_cost = 10
jobs_with_discount = list("Chef")

/datum/uplink_item/jobspecific/service/kitchengun
name = "Kitchen Gun"
desc = "An otherwise ordinary glock that also has the power to completely clean the surface of anything it's fired on in three shots. Causes the holder to shout their speech loudly while held. Comes with night vision goggles for after dark cleaning."
item = /obj/item/weapon/storage/box/syndie_kit/kitchengun
cost = 14
discounted_cost = 10
jobs_with_discount = list("Chef","Janitor")

/datum/uplink_item/jobspecific/service/cautionsign
name = "Proximity Mine Wet Floor Sign"
desc = "An anti-personnel proximity mine cleverly disguised as a wet floor caution sign that is triggered by running past it. Interact with it to start the 15 second timer and activate it again to disarm."
Expand Down
9 changes: 9 additions & 0 deletions code/game/objects/items/weapons/storage/uplink_kits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,15 @@
/obj/item/clothing/glasses/hud/security/sunglasses/syndishades,
)

/obj/item/weapon/storage/box/syndie_kit/kitchengun
name = "Kitchen gun"
items_to_spawn = list(
/obj/item/weapon/gun/projectile/glock/fancy/kitchengun,
/obj/item/ammo_storage/magazine/m380auto,
/obj/item/ammo_storage/magazine/m380auto,
/obj/item/clothing/glasses/scanner/night
)

/obj/item/weapon/storage/box/syndie_kit/boolets
name = "Shotgun shells"
items_to_spawn = list(/obj/item/ammo_casing/shotgun/fakebeanbag = 6)
Expand Down
15 changes: 15 additions & 0 deletions code/modules/projectiles/guns/projectile/pistol.dm
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,21 @@
mag_overlay()
update_icon()

/obj/item/weapon/gun/projectile/glock/fancy/kitchengun
name = "\improper KITCHEN GUN!"
desc = "AN UBIQUITOUS SIDEARM PRODUCED BY CYBERSUN! SAY GOODBYE TO DAILY STAINS AND DIRTY SURFACES IN JUST THREE SHOTS! ACCEPTS .380 ROUNDS! FITS IN YOUR POCKET! <br><span class='notice'>COMES WITH PLATINUM SIDING AND LASER SIGHT FOR AFTER DARK CLEANING!</span>"
fire_sound = 'sound/weapons/kitchengun.ogg'
var/list/cleaning_targets = list()

/obj/item/weapon/gun/projectile/glock/fancy/kitchengun/affect_speech(var/datum/speech/speech, var/mob/living/L)
if(L.get_active_hand() == src)
speech.message = uppertext(speech.message) + "!"

/obj/item/weapon/gun/projectile/glock/fancy/kitchengun/play_firesound(mob/user, var/reflex)
. = ..()
if(!silenced)
visible_message("<span class='danger'><big>BANG!</big></span>")

/obj/item/weapon/gun/projectile/glock/lockbox
max_shells = 0
spawn_mag = FALSE
Expand Down
16 changes: 16 additions & 0 deletions code/modules/projectiles/projectile/bullets.dm
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,22 @@
agony = 15
penetration = 2

/obj/item/projectile/bullet/auto380/to_bump(atom/A)
. = ..()
if(A && shot_from.type == /obj/item/weapon/gun/projectile/glock/fancy/kitchengun)
var/obj/item/weapon/gun/projectile/glock/fancy/kitchengun/K = shot_from
if(!(A in K.cleaning_targets)) // BUT WITH THREE SHOTS FROM KITCHEN GUN
K.cleaning_targets += A // BANG
K.cleaning_targets[A]++ // BANG
if(K.cleaning_targets[A] > 2) // BANG
var/turf/T = get_turf(A)
T.clean_act(CLEANLINESS_BLEACH)
for(var/obj/O in T)
O.clean_act(CLEANLINESS_BLEACH)
A.clean_act(CLEANLINESS_BLEACH) // AND IT SPARKLES LIKE NEW
K.cleaning_targets[A] = 0
K.cleaning_targets -= A

/obj/item/projectile/bullet/auto380/practice
damage = 2
agony = 0
Expand Down
Binary file added sound/weapons/kitchengun.ogg
Binary file not shown.

0 comments on commit 993c7f0

Please sign in to comment.