mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-22 12:29:46 +01:00
Minor protolathe removal (#14134)
This commit is contained in:
@@ -50,7 +50,6 @@ var/list/worths = list(
|
||||
/obj/item/gun/energy/floragun = 1500,
|
||||
/obj/item/gun/energy/mindflayer = 4500,
|
||||
/obj/item/gun/energy/toxgun = 3500,
|
||||
/obj/item/gun/energy/beegun = 4500,
|
||||
/obj/item/gun/energy/mousegun = 2000,
|
||||
/obj/item/gun/energy/net = 3500,
|
||||
/obj/item/gun/energy/vaurca/bfg = 20000,
|
||||
|
||||
@@ -96,27 +96,6 @@
|
||||
turret_is_lethal = 0
|
||||
turret_sprite_set = "net"
|
||||
|
||||
/obj/item/gun/energy/beegun
|
||||
name = "\improper NanoTrasen Portable Apiary"
|
||||
desc = "An experimental firearm that converts energy into bees, for purely botanical purposes."
|
||||
icon = 'icons/obj/guns/gyrorifle.dmi'
|
||||
icon_state = "gyrorifle"
|
||||
item_state = "gyrorifle"
|
||||
has_item_ratio = FALSE
|
||||
charge_meter = 0
|
||||
w_class = ITEMSIZE_LARGE
|
||||
fire_sound = 'sound/effects/Buzz2.ogg'
|
||||
force = 5
|
||||
projectile_type = /obj/item/projectile/energy/bee
|
||||
slot_flags = SLOT_BACK
|
||||
max_shots = 9
|
||||
sel_mode = 1
|
||||
burst = 3
|
||||
burst_delay = 1
|
||||
move_delay = 3
|
||||
fire_delay = 0
|
||||
dispersion = list(0, 8)
|
||||
|
||||
/obj/item/gun/energy/mousegun
|
||||
name = "pest gun"
|
||||
desc = "The NT \"Arodentia\" Pesti-Shock is a highly sophisticated and probably safe beamgun designed for rapid pest-control."
|
||||
|
||||
@@ -169,28 +169,6 @@
|
||||
/obj/item/projectile/energy/gravitydisabler/proc/turnongravity(var/area/A)
|
||||
A.gravitychange(TRUE)
|
||||
|
||||
/obj/item/projectile/energy/bee
|
||||
name = "bees"
|
||||
icon = 'icons/obj/apiary_bees_etc.dmi'
|
||||
icon_state = "beegun"
|
||||
check_armor = "bio"
|
||||
damage = 5
|
||||
damage_type = BRUTE
|
||||
pass_flags = PASSTABLE | PASSGRILLE | PASSRAILING
|
||||
embed = 0
|
||||
weaken = 0
|
||||
|
||||
/obj/item/projectile/energy/bee/on_impact(var/atom/A)
|
||||
playsound(src.loc, pick('sound/effects/Buzz1.ogg','sound/effects/Buzz2.ogg'), 70, 1)
|
||||
var/turf/T = get_turf(A)
|
||||
if(!istype(T, /turf/simulated/wall) && !istype(A, /obj/structure/window) && !istype(A, /obj/machinery/door))
|
||||
for(var/i=1, i<=8, i++)
|
||||
var/atom/movable/x = new /mob/living/simple_animal/bee/beegun //hackmaster pro, butt fuck it
|
||||
x.forceMove(T)
|
||||
else
|
||||
src.visible_message("<span class='danger'>[src] splat sickly against [T]!</span>")
|
||||
..()
|
||||
|
||||
/obj/item/projectile/energy/blaster
|
||||
name = "blaster bolt"
|
||||
icon_state = "heavybolt"
|
||||
|
||||
@@ -62,11 +62,6 @@
|
||||
materials = list(DEFAULT_WALL_MATERIAL = 1000, MATERIAL_GLASS = 3000, MATERIAL_PHORON = 1000)
|
||||
build_path = /obj/item/shield/energy
|
||||
|
||||
/datum/design/item/weapon/gun/beegun
|
||||
req_tech = list(TECH_MATERIAL = 6, TECH_BIO = 4, TECH_POWER = 4, TECH_COMBAT = 6, TECH_MAGNET = 4)
|
||||
materials = list(DEFAULT_WALL_MATERIAL = 2000, MATERIAL_GLASS = 2000, MATERIAL_SILVER = 500, MATERIAL_DIAMOND = 3000)
|
||||
build_path = /obj/item/gun/energy/beegun
|
||||
|
||||
/datum/design/item/weapon/gravity_gun //Hello, Gordon!
|
||||
desc = "This nifty gun disables the gravity in the area you shoot at. Use with caution."
|
||||
req_tech = list(TECH_COMBAT = 5, TECH_BLUESPACE = 5)
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
################################
|
||||
# Example Changelog File
|
||||
#
|
||||
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
|
||||
#
|
||||
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
|
||||
# When it is, any changes listed below will disappear.
|
||||
#
|
||||
# Valid Prefixes:
|
||||
# bugfix
|
||||
# wip (For works in progress)
|
||||
# tweak
|
||||
# soundadd
|
||||
# sounddel
|
||||
# rscadd (general adding of nice things)
|
||||
# rscdel (general deleting of nice things)
|
||||
# imageadd
|
||||
# imagedel
|
||||
# maptweak
|
||||
# spellcheck (typo fixes)
|
||||
# experiment
|
||||
# balance
|
||||
# admin
|
||||
# backend
|
||||
# security
|
||||
# refactor
|
||||
#################################
|
||||
|
||||
# Your name.
|
||||
author: TheDanseMacabre
|
||||
|
||||
# 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:
|
||||
- rscdel: "The bee gun has been removed."
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.9 KiB |
Reference in New Issue
Block a user