Merge pull request #2534 from yogstation13/upstream-merge-40224

[MIRROR] Adds Gonbolas
This commit is contained in:
1fbff5f83b23d39d38b1dfcb4cac8d9b
2018-09-15 19:14:26 +02:00
committed by GitHub
5 changed files with 49 additions and 0 deletions

View File

@@ -70,6 +70,8 @@
#define STATUS_EFFECT_ICHORIAL_STAIN /datum/status_effect/ichorial_stain //Prevents a servant from being revived by vitality matrices for one minute. #define STATUS_EFFECT_ICHORIAL_STAIN /datum/status_effect/ichorial_stain //Prevents a servant from being revived by vitality matrices for one minute.
#define STATUS_EFFECT_GONBOLAPACIFY /datum/status_effect/gonbolaPacify //Gives the user gondola traits while the gonbola is attached to them.
///////////// /////////////
// NEUTRAL // // NEUTRAL //
///////////// /////////////

View File

@@ -507,3 +507,21 @@
desc = "Your body is covered in blue ichor! You can't be revived by vitality matrices." desc = "Your body is covered in blue ichor! You can't be revived by vitality matrices."
icon_state = "ichorial_stain" icon_state = "ichorial_stain"
alerttooltipstyle = "clockcult" alerttooltipstyle = "clockcult"
/datum/status_effect/gonbolaPacify
id = "gonbolaPacify"
status_type = STATUS_EFFECT_MULTIPLE
tick_interval = -1
alert_type = null
/datum/status_effect/gonbolaPacify/on_apply()
owner.add_trait(TRAIT_PACIFISM, "gonbolaPacify")
owner.add_trait(TRAIT_MUTE, "gonbolaMute")
owner.add_trait(TRAIT_JOLLY, "gonbolaJolly")
to_chat(owner, "<span class='notice'>You suddenly feel at peace and feel no need to make any sudden or rash actions...</span>")
return ..()
/datum/status_effect/gonbolaPacify/on_remove()
owner.remove_trait(TRAIT_PACIFISM, "gonbolaPacify")
owner.remove_trait(TRAIT_MUTE, "gonbolaMute")
owner.remove_trait(TRAIT_JOLLY, "gonbolaJolly")

View File

@@ -363,3 +363,22 @@
B.Crossed(hit_atom) B.Crossed(hit_atom)
qdel(src) qdel(src)
..() ..()
/obj/item/restraints/legcuffs/bola/gonbola
name = "gonbola"
desc = "Hey, if you have to be hugged in the legs by anything, it might as well be this little guy."
icon_state = "gonbola"
breakouttime = 300
slowdown = 0
var/datum/status_effect/gonbolaPacify/effectReference
/obj/item/restraints/legcuffs/bola/gonbola/throw_impact(atom/hit_atom)
. = ..()
if(iscarbon(hit_atom))
var/mob/living/carbon/C = hit_atom
effectReference = C.apply_status_effect(STATUS_EFFECT_GONBOLAPACIFY)
/obj/item/restraints/legcuffs/bola/gonbola/dropped(mob/user)
. = ..()
if(effectReference)
QDEL_NULL(effectReference)

View File

@@ -94,6 +94,16 @@
category= CAT_WEAPONRY category= CAT_WEAPONRY
subcategory = CAT_WEAPON subcategory = CAT_WEAPON
/datum/crafting_recipe/gonbola
name = "Gonbola"
result = /obj/item/restraints/legcuffs/bola/gonbola
reqs = list(/obj/item/restraints/handcuffs/cable = 1,
/obj/item/stack/sheet/metal = 6,
/obj/item/stack/sheet/animalhide/gondola = 1)
time = 40
category= CAT_WEAPONRY
subcategory = CAT_WEAPON
/datum/crafting_recipe/tailclub /datum/crafting_recipe/tailclub
name = "Tail Club" name = "Tail Club"
result = /obj/item/tailclub result = /obj/item/tailclub

Binary file not shown.

Before

Width:  |  Height:  |  Size: 121 KiB

After

Width:  |  Height:  |  Size: 123 KiB