Completed adding Kidan Ambassador decorations
@@ -64,7 +64,7 @@
|
||||
|
||||
/obj/item/weapon/soap/deluxe
|
||||
icon_state = "soapdeluxe"
|
||||
|
||||
|
||||
/obj/item/weapon/soap/deluxe/New()
|
||||
desc = "A deluxe Waffle Co. brand bar of soap. Smells of [pick("lavender", "vanilla", "strawberry", "chocolate" ,"space")]."
|
||||
|
||||
@@ -890,3 +890,8 @@ proc
|
||||
icon_state = "rollball"
|
||||
desc = "A device bored paper pushers use to remind themselves that the time did not stop yet."
|
||||
|
||||
/obj/item/weapon/kidanglobe
|
||||
name = "Kidan homeworld globe"
|
||||
icon = 'icons/obj/decorations.dmi'
|
||||
icon_state = "kidanglobe"
|
||||
desc = "A globe of the Kidan homeworld."
|
||||
@@ -249,3 +249,8 @@ obj/item/weapon/twohanded/
|
||||
/obj/item/weapon/twohanded/spear/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
|
||||
playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1)
|
||||
return ..()
|
||||
|
||||
/obj/item/weapon/twohanded/spear/kidan
|
||||
icon_state = "kidanspear0"
|
||||
name = "Kidan spear"
|
||||
desc = "A spear brought over from the Kidan homeworld."
|
||||
@@ -178,3 +178,13 @@ obj/item/weapon/wirerod/attackby(var/obj/item/I, mob/user as mob)
|
||||
user << "<span class='notice'>You fasten the wirecutters to the top of the rod with the cable, prongs outward.</span>"
|
||||
del(I)
|
||||
del(src)
|
||||
|
||||
|
||||
/obj/item/weapon/twohanded/spear/kidan
|
||||
icon_state = "kidanspear"
|
||||
name = "Kidan spear"
|
||||
desc = "A one-handed spear brought over from the Kidan homeworld."
|
||||
icon_state = "kidanspear"
|
||||
item_state = "kidanspear"
|
||||
force = 10
|
||||
throwforce = 15
|
||||
@@ -150,15 +150,10 @@
|
||||
desc = "This plaque commemorates the fall of the Atmos FEA division. For all the charred, dizzy, and brittle men who have died in its hands."
|
||||
icon_state = "atmosplaque"
|
||||
|
||||
/obj/structure/sign/double/maltesefalcon //The sign is 64x32, so it needs two tiles. ;3
|
||||
name = "The Maltese Falcon"
|
||||
desc = "The Maltese Falcon, Space Bar and Grill."
|
||||
|
||||
/obj/structure/sign/double/maltesefalcon/left
|
||||
icon_state = "maltesefalcon-left"
|
||||
|
||||
/obj/structure/sign/double/maltesefalcon/right
|
||||
icon_state = "maltesefalcon-right"
|
||||
/obj/structure/sign/kidanplaque
|
||||
name = "Kidan wall trophy"
|
||||
desc = "A dead and stuffed Diona nymph, mounted on a board."
|
||||
icon_state = "kidanplaque"
|
||||
|
||||
/obj/structure/sign/science //These 3 have multiple types, just var-edit the icon_state to whatever one you want on the map
|
||||
name = "\improper SCIENCE!"
|
||||
@@ -228,4 +223,5 @@
|
||||
/obj/structure/sign/directions/evac
|
||||
name = "\improper Escape Arm"
|
||||
desc = "A direction sign, pointing out which way escape shuttle dock is."
|
||||
icon_state = "direction_evac"
|
||||
icon_state = "direction_evac"
|
||||
|
||||
|
||||
@@ -6,4 +6,10 @@
|
||||
anchored = 1
|
||||
density = 1
|
||||
|
||||
/obj/structure/poopiepants
|
||||
/obj/structure/kidanstatue
|
||||
name = "Obsidian Kidan warrior statue"
|
||||
desc = "A beautifully carved and menacing statue of a Kidan warrior made out of obsidian. It looks very heavy."
|
||||
icon = 'icons/obj/decorations.dmi'
|
||||
icon_state = "kidanstatue"
|
||||
anchored = 1
|
||||
density = 1
|
||||
@@ -1,4 +1,7 @@
|
||||
# DMITool Difference Report: Z:\Git\Space Station 13\Baystation12\icons\mob\in-hand\left Z:\Git\Space Station 13\Baystation12\icons\mob\in-hand\right
|
||||
--- Z:\Git\Space Station 13\Baystation12\icons\mob\in-hand\left\ambassdor_left.dmi
|
||||
+++ Z:\Git\Space Station 13\Baystation12\icons\mob\in-hand\right\ambassdor_left.dmi
|
||||
+ kidanspear
|
||||
--- Z:\Git\Space Station 13\Baystation12\icons\mob\in-hand\left\cable_stuff.dmi
|
||||
+++ Z:\Git\Space Station 13\Baystation12\icons\mob\in-hand\right\cable_stuff.dmi
|
||||
+ cuff_cyan
|
||||
|
||||
|
After Width: | Height: | Size: 445 B |
|
After Width: | Height: | Size: 445 B |
|
Before Width: | Height: | Size: 216 KiB After Width: | Height: | Size: 216 KiB |
|
Before Width: | Height: | Size: 207 KiB After Width: | Height: | Size: 206 KiB |
|
Before Width: | Height: | Size: 36 KiB After Width: | Height: | Size: 37 KiB |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 5.4 KiB |
|
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 28 KiB |