diff --git a/code/modules/background/citizenship/human.dm b/code/modules/background/citizenship/human.dm index 15b2d82e2e1..acdc08ca678 100644 --- a/code/modules/background/citizenship/human.dm +++ b/code/modules/background/citizenship/human.dm @@ -42,7 +42,7 @@ /obj/item/storage/box/tcfl_pamphlet = 1, /obj/item/device/versebook/biesel = 1, //constitution /obj/item/stamp/biesel = 1, - /obj/item/gun/energy/pistol = 1 + /obj/item/gun/energy/blaster/revolver = 1 ) diff --git a/code/modules/projectiles/guns/energy/blaster.dm b/code/modules/projectiles/guns/energy/blaster.dm index f9c07f04557..b6a98ee3bb7 100644 --- a/code/modules/projectiles/guns/energy/blaster.dm +++ b/code/modules/projectiles/guns/energy/blaster.dm @@ -54,18 +54,9 @@ fire_sound = 'sound/weapons/laserstrong.ogg' projectile_type = /obj/item/projectile/energy/blaster max_shots = 8 - w_class = ITEMSIZE_NORMAL - -/obj/item/gun/energy/blaster/revolver/verb/spin_cylinder() - set name = "Spin cylinder" - set desc = "Fun when you're bored out of your skull." - set category = "Object" - var/mob/living/carbon/human/user - if(istype(usr,/mob/living/carbon/human)) - user = usr - else - return + w_class = ITEMSIZE_SMALL +/obj/item/gun/energy/blaster/revolver/unique_action(mob/living/user) user.visible_message(SPAN_WARNING("\The [user] spins the cylinder of \the [src]!"), SPAN_WARNING("You spin the cylinder of \the [src]!"), SPAN_NOTICE("You hear something metallic spin and click.")) playsound(src.loc, 'sound/weapons/revolver_spin.ogg', 100, 1) diff --git a/html/changelogs/Ben10083 - BieselBigIron.yml b/html/changelogs/Ben10083 - BieselBigIron.yml new file mode 100644 index 00000000000..c24a7e8cc53 --- /dev/null +++ b/html/changelogs/Ben10083 - BieselBigIron.yml @@ -0,0 +1,15 @@ +# Your name. +author: Ben10083 + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Biesel Consulars now are given a blaster revolver for self-defence." + - tweak: "Blaster Revolver now considered small." + - tweak: "Blaster Revolver cylinder spin now under unique action."