Sord-be-gone (#11527)

This commit is contained in:
TheDanseMacabre
2021-03-26 10:25:36 +01:00
committed by GitHub
parent 9680b5d2e8
commit 1435fdd0c7
5 changed files with 41 additions and 22 deletions
@@ -244,7 +244,6 @@
/obj/item/xmasgift/medium/get_gift_type()
var/picked_gift_type = pick(
/obj/item/sord,
/obj/random/booze,
/obj/random/random_flag,
/obj/item/storage/belt/champion,
@@ -128,24 +128,6 @@
pickup_sound = /decl/sound_category/sword_pickup_sound
equip_sound = /decl/sound_category/sword_equip_sound
/obj/item/sord
name = "\improper SORD"
desc = "This thing is so unspeakably shitty you are having a hard time even holding it."
icon = 'icons/obj/sword.dmi'
icon_state = "sord"
item_state = "sord"
slot_flags = SLOT_BELT
force = 2
throwforce = 1
sharp = 1
edge = TRUE
w_class = ITEMSIZE_NORMAL
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
hitsound = 'sound/weapons/bladeslice.ogg'
contained_sprite = TRUE
drop_sound = 'sound/items/drop/card.ogg'
pickup_sound = 'sound/items/pickup/card.ogg'
/obj/item/banhammer
desc = "banhammer"
name = "banhammer"
@@ -144,9 +144,6 @@ STOCK_ITEM_UNCOMMON(advwelder, 2)
else
new /obj/item/weldingtool/hugetank(L)
STOCK_ITEM_UNCOMMON(sord, 1)
new /obj/item/sord(L)
STOCK_ITEM_UNCOMMON(policebaton, 1.5)
new /obj/item/melee/classic_baton(L)
@@ -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: DanseMacabre
# 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: "Removed homestuck reference #1 (sord)"
Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 20 KiB