mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-24 13:30:42 +01:00
Wizard blade, loadout and general dev tweaks (#1905)
-add reflection and parry to the wizard rune sword -tweaks and add more things to the custom loadout -remove the linebin and thermals from cargo -add exosuit paint kits and some other things to cargo spawn -re-add the non slip flag to skrells - Fixes #1890 -adds more hats -beastmen botanists now get some snowflake gloves -unathi are now poisoned by alcohol, at jackboot's request -fix smacking people against toilets having no delay -fix some visible message issues and wrong date in the sink and shower -removed being able to select bst gear using chameleon clothing -fix some grammer -fix vaurca voidsuits having an outdated species
This commit is contained in:
@@ -18,6 +18,7 @@
|
||||
|
||||
/obj/structure/toilet/attack_hand(mob/living/user as mob)
|
||||
if(swirlie)
|
||||
usr.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
|
||||
usr.visible_message("<span class='danger'>[user] slams the toilet seat onto [swirlie.name]'s head!</span>", "<span class='notice'>You slam the toilet seat onto [swirlie.name]'s head!</span>", "You hear reverberating porcelain.")
|
||||
swirlie.adjustBruteLoss(8)
|
||||
return
|
||||
@@ -53,6 +54,7 @@
|
||||
return
|
||||
|
||||
if(istype(I, /obj/item/weapon/grab))
|
||||
usr.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
|
||||
var/obj/item/weapon/grab/G = I
|
||||
|
||||
if(isliving(G.affecting))
|
||||
@@ -117,7 +119,7 @@
|
||||
|
||||
/obj/machinery/shower
|
||||
name = "shower"
|
||||
desc = "The HS-451. Installed in the 2550s by the Hygiene Division."
|
||||
desc = "The HS-451. Installed in the 2450s by the Hygiene Division."
|
||||
icon = 'icons/obj/watercloset.dmi'
|
||||
icon_state = "shower"
|
||||
density = 0
|
||||
@@ -453,9 +455,7 @@
|
||||
R.cell.charge -= 20
|
||||
else
|
||||
B.deductcharge(B.hitcost)
|
||||
user.visible_message( \
|
||||
"<span class='danger'>[user] was stunned by \his wet [O]!</span>", \
|
||||
"<span class='userdanger'>[user] was stunned by \his wet [O]!</span>")
|
||||
user.visible_message("<span class='danger'>[user] was stunned by \the [O]!</span>")
|
||||
return 1
|
||||
// Short of a rewrite, this is necessary to stop monkeycubes being washed.
|
||||
else if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/monkeycube))
|
||||
|
||||
Reference in New Issue
Block a user