From a3b4e1db263a1f42211fe50a7d7fc4d7fba882f7 Mon Sep 17 00:00:00 2001
From: TheDanseMacabre <57339900+TheDanseMacabre@users.noreply.github.com>
Date: Thu, 9 Jun 2022 06:42:26 -0400
Subject: [PATCH] Minor protolathe removal (#14134)
---
code/modules/item_worth/worths_list.dm | 1 -
.../projectiles/guns/energy/special.dm | 21 ---------
code/modules/projectiles/projectile/energy.dm | 22 ----------
.../designs/protolathe/weapon_designs.dm | 5 ---
html/changelogs/dansemacabre-lowroleplay.yml | 41 ++++++++++++++++++
icons/obj/guns/gyrorifle.dmi | Bin 1905 -> 0 bytes
6 files changed, 41 insertions(+), 49 deletions(-)
create mode 100644 html/changelogs/dansemacabre-lowroleplay.yml
delete mode 100644 icons/obj/guns/gyrorifle.dmi
diff --git a/code/modules/item_worth/worths_list.dm b/code/modules/item_worth/worths_list.dm
index 3dec09800e8..35e8248c47d 100644
--- a/code/modules/item_worth/worths_list.dm
+++ b/code/modules/item_worth/worths_list.dm
@@ -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,
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index 88eea2b3b57..5ed622eec5c 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -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."
diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm
index 8463718caf1..28ce5b2f8b3 100644
--- a/code/modules/projectiles/projectile/energy.dm
+++ b/code/modules/projectiles/projectile/energy.dm
@@ -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("[src] splat sickly against [T]!")
- ..()
-
/obj/item/projectile/energy/blaster
name = "blaster bolt"
icon_state = "heavybolt"
diff --git a/code/modules/research/designs/protolathe/weapon_designs.dm b/code/modules/research/designs/protolathe/weapon_designs.dm
index e7526da0a5b..effcd7ec077 100644
--- a/code/modules/research/designs/protolathe/weapon_designs.dm
+++ b/code/modules/research/designs/protolathe/weapon_designs.dm
@@ -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)
diff --git a/html/changelogs/dansemacabre-lowroleplay.yml b/html/changelogs/dansemacabre-lowroleplay.yml
new file mode 100644
index 00000000000..7374ad25ca1
--- /dev/null
+++ b/html/changelogs/dansemacabre-lowroleplay.yml
@@ -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."
diff --git a/icons/obj/guns/gyrorifle.dmi b/icons/obj/guns/gyrorifle.dmi
deleted file mode 100644
index ceefdd76b9a5681059e002bb8a19c2b92b387f98..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1905
zcmV-%2afoOP)V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r
z;NmRLOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5DZR2NzbG>;Csm1yGbOXA7$|1Q#hF%=
zn41b^XXKX@7vzKV85!vqndlf|(VUZ?n39@;%Lq*M@i`d?#U=z4>y~Gx<^YW+NmG0g
zIW~}@DLyHY1jWV0xD+cZxca$(;|>6bfrq&<-L$Cy00q@aL_t(|ob8(pSED)*hC`v$
zTyJ1M`i0c3Zj0Job^rgryZHbuBr^$!i=I1AJsxEy$-E)KbKW3h1VIo4L3|7%#%42S
zKI+$~XM8f^I7#I9D2`_H`OJKxD2n4KEIu_!8YRhM5no)ybI#}WhhJR$69>g7CrOhe
zxxBoL7ZH!-m;Njk|1Q!v4v9}qlBS9NK^FLmTp!Uw7pUT?QUJs!CrkhwcOZfx;arDlTV?Mw34EL?%ryc6vTNTM`lm+2x>1<9(^ryEaoTwagG
z7x7hm`HGa2i7e;sOI*nc7GO1hCD+r_79gK7QIy7u$UUjuxcDZ%i*Mf%0fGsUwaV4M
z^|%9_=4bFc>&}E)AF9L%SP)5MBt*41zW_B3KOZI&9GudC=4WJ?5cV2UTOa{fw2aG)
z$X0pJ`diJ<=sy#~$(O5)>t{*M
zv(*xNs^HDf7%~%sQO^;sO32ksw`vJ)-nuqmCI+J)ghl`xD4^47*i3vNhRp;)5ClOG
z1VIo4LG;FFAg%vO6~o~hT)}#aDDb+V?`E|dw0&1#0@mwo0SU+%$DDL+D>xH+sKQb?
z=bH_~1#Al$hXioI*KESN04u>^o5QH)Zhu8p&v{X>`ZfS;RsDc~EE62DevNN#Cpc_#
z7$wzFo}T-SET3D&Tg5`<`}|`Wc3*ed<{*MKGtnS>l`}8V#oHyU!Gi4qbHscF>+fxw
zcTN!G)E8O+vuB@~JzIoyE9VifUpSX;U)#KU03oNp*lbMcjewSn_1Y@mc}Ij0n12j~
z``hNr&Iy8A{KdxnH24H0XSv#&ko^jWhuP+>69l>TH_cDOk8t$4Q`gk@hX>l`t`mf}
zk(*~DGy!0Eplv?B+m4?5dBX%j5ClOG1VIo4@mcv_A1Bm|ajG!bIp7{cdtGdO_Ns9T
z5uXG$)z4CpH}`W)o)*y9lMa+OS!~h4Gt^cx3Gi$AO$zenKF_gZ3w@|l=;H-f4|@7>
z0me82-@Dfd@N4;X3i9T@cJNV@J74G{2Dig)U2%4T9&>=N<@-}Y9DL)>8=rpTdoV#q
z4rqzcYxys6FvW9l@jAQ_q1&^Wh4t~A<&521+i|$Zrx8~5p&=YP_`0y9sUpBBhvkGd_9iG=m2}8mr
zh1qZJTbJGsbB^pjOY?_640PB)5ClOG1kr=5-YrV&%5E3hHYl@Ql095I`MR%yvi#A#
zwA%+N2uf_1^rOTTTwV86P+nhKJ?{4Vu*UlU0iB9m<8{(|DUkiWuYhhr&H>N!`zcV}
zIRxD7Z$nz&?r(eobU9rCUIih8D|R=f!n*$RFu%R^N{}h@!%tsUr+&5PB&hH!cC38e
zD(>zMuIg3fpbNyC>+sfs+}$W5qL&f8bF
zE@#ioJ^LmO_ZysfL>GZ-_&fvlVBG<957fFTD=h=+9huiQ@Du{;|78d@c%{C>65u7M
z>wjMXzD;Nbub}5(-HH1i)b%5`|Lp?M_0L{MuTTMIA9ORC`n{cp;K)>$@b!O=N5N4F
z=ss@ClehDG?BUqrWd9*6PiEXeD)i5R?l8EoRt;geMjtRBK@bE%5ClPd97gu{|32gT
z`x7v#zdr?^U%+_&{xpo~?@z*b{{BRa=I>9%SpNQGjO6c6$2k7}gpA_vPstem{-ltA
rsrmGK;7$JiN8oM#K0y!!K}^Aa+zD`_{84Kc00000NkvXXu0mjfGZk$T