From 88252397c2f99567ba40cc0c2aa9c1f9b48f65d4 Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 18 Apr 2017 20:06:35 +0100 Subject: [PATCH 1/8] Spelling/Grammar fixes in the occult --- code/game/gamemodes/cult/ritual.dm | 14 +++++++------- code/game/gamemodes/cult/runes.dm | 2 +- code/game/gamemodes/cult/talisman.dm | 4 ++-- code/game/objects/items/weapons/holy_weapons.dm | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index 976f2cd8fc8..a14cb75daf1 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -145,7 +145,7 @@ text += "Talisman of Teleportation
The talisman form of the Teleport rune will transport the invoker to a selected Teleport rune once.

" - text += "Talisman of Fabrication
This talisman is the main way of creating construct shells. To use it, one must strike 30 sheets of metal with the talisman. The sheets will then be twisted into a construct shell, ready to recieve a soul to occupy it.

" + text += "Talisman of Fabrication
This talisman is the main way of creating construct shells. To use it, one must strike 30 sheets of metal with the talisman. The sheets will then be twisted into a construct shell, ready to receive a soul to occupy it.

" text += "Talisman of Tome Summoning
This talisman will produce a single tome at your feet.

" @@ -159,9 +159,9 @@ Robotic lifeforms will suffer the effects of a heavy electromagnetic pulse instead.

" text += "Talisman of Armaments
The Talisman of Arming will equip the user with armored robes, a backpack, shoes, an eldritch longsword, and an empowered bola. Any equipment that cannot \ - be equipped will not be summoned, weaponary will be put on the floor below the user. Attacking a fellow cultist with it will instead equip them.

" + be equipped will not be summoned, weaponry will be put on the floor below the user. Attacking a fellow cultist with it will instead equip them.

" - text += "Talisman of Horrors
The Talisman of Horror must be applied directly to the victim, it will shatter your victim's mind with visions of the endtimes that may incapitate them.

" + text += "Talisman of Horrors
The Talisman of Horror must be applied directly to the victim, it will shatter your victim's mind with visions of the end-times that may incapacitate them.

" text += "Talisman of Shackling
The Talisman of Shackling must be applied directly to the victim, it has 4 uses and cuffs victims with magic shackles that disappear when removed.

" @@ -169,7 +169,7 @@ text += "Equipment:

" - text += "Cult Blade
Cult blades are sharp weapons that, notably, cannot be used by noncultists. These blades are produced by the Talisman of Arming.

" + text += "Cult Blade
Cult blades are sharp weapons that, notably, cannot be used by non-cultists. These blades are produced by the Talisman of Arming.

" text += "Cult Bola
Cult bolas are strong bolas, useful for snaring targets. These bolas are produced by the Talisman of Arming.

" @@ -216,14 +216,14 @@ if(!((CULT_ELDERGOD in cult_mode.objectives) || (CULT_SLAUGHTER in cult_mode.objectives))) to_chat(user, "[cult_mode.cultdat.entity_name]'s power does not wish to be unleashed!") return 0 - var/confirm_final = alert(user, "This is the FINAL step to summon your dietys power, it is a long, painful ritual and the crew will be alerted to your presence", "Are you prepared for the final battle?", "My life for [cult_mode.cultdat.entity_name]!", "No") + var/confirm_final = alert(user, "This is the FINAL step to summon your deities power, it is a long, painful ritual and the crew will be alerted to your presence", "Are you prepared for the final battle?", "My life for [cult_mode.cultdat.entity_name]!", "No") if(confirm_final == "No" || confirm_final == null) to_chat(user, "You decide to prepare further before scribing the rune.") return 0 else return 1 else//the game mode is not cult..but we ARE a cultist...ALL ON THE ADMINBUS - var/confirm_final = alert(user, "This is the FINAL step to summon your dietys power, it is a long, painful ritual and the crew will be alerted to your presence", "Are you prepared for the final battle?", "My life for [cult_mode.cultdat.entity_name]!", "No") + var/confirm_final = alert(user, "This is the FINAL step to summon your deities power, it is a long, painful ritual and the crew will be alerted to your presence", "Are you prepared for the final battle?", "My life for [cult_mode.cultdat.entity_name]!", "No") if(confirm_final == "No" || confirm_final == null) to_chat(user, "You decide to prepare further before scribing the rune.") return 0 @@ -269,7 +269,7 @@ return if(ispath(rune_to_scribe, /obj/effect/rune/narsie) || ispath(rune_to_scribe, /obj/effect/rune/slaughter))//may need to change this - Fethas if(finale_runes_ok(user,rune_to_scribe)) - command_announcement.Announce("Figments from an eldritch god are being summoned somwhere on the station from an unknown dimension. Disrupt the ritual at all costs!","Central Command Higher Dimensionsal Affairs", 'sound/AI/spanomalies.ogg') + command_announcement.Announce("Figments from an eldritch god are being summoned somwhere on the station from an unknown dimension. Disrupt the ritual at all costs!","Central Command Higher Dimensional Affairs", 'sound/AI/spanomalies.ogg') for(var/B in spiral_range_turfs(1, user, 1)) var/turf/T = B var/obj/machinery/shield/N = new(T) diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 14fe620cc3c..8f0a53e4371 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -534,7 +534,7 @@ var/list/teleport_runes = list() /obj/effect/rune/slaughter cultist_name = "Call Forth The Slaughter (Demons)" - cultist_desc = "Calls forth the doom of a eldrtich being. Three slaughter demons will appear to wreak havoc on the station." + cultist_desc = "Calls forth the doom of an eldritch being. Three slaughter demons will appear to wreak havoc on the station." invocation = null req_cultists = 9 color = rgb(125,23,23) diff --git a/code/game/gamemodes/cult/talisman.dm b/code/game/gamemodes/cult/talisman.dm index 9e86a091625..4bf4bd9f9e7 100644 --- a/code/game/gamemodes/cult/talisman.dm +++ b/code/game/gamemodes/cult/talisman.dm @@ -64,7 +64,7 @@ dat += "Ta'gh fara'qha fel d'amar det! - Allows you to destroy technology in a short range.
" dat += "Fuu ma'jin! - Allows you to stun a person by attacking them with the talisman.
" dat += "Kla'atu barada nikt'o! - Two use talisman, first use makes all nearby runes invisible, second use reveals nearby hidden runes.
" - dat += "Kal'om neth! - Summons a soul stone, used to capure the spirits of dead or dying humans.
" + dat += "Kal'om neth! - Summons a soul stone, used to capture the spirits of dead or dying humans.
" dat += "Daa'ig osk! - Summons a construct shell for use with soulstone-captured souls. It is too large to carry on your person.
" var/datum/browser/popup = new(user, "talisman", "", 400, 400) popup.set_content(jointext(dat, "")) @@ -300,7 +300,7 @@ /obj/item/weapon/paper/talisman/horror/attack(mob/living/target, mob/living/user) if(iscultist(user)) - to_chat(user, "You disturb [target] with visons of the end!") + to_chat(user, "You disturb [target] with visions of the end!") if(iscarbon(target)) var/mob/living/carbon/H = target H.AdjustHallucinate(30) diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm index cda1145d90c..375b24247ab 100644 --- a/code/game/objects/items/weapons/holy_weapons.dm +++ b/code/game/objects/items/weapons/holy_weapons.dm @@ -283,7 +283,7 @@ /obj/item/weapon/nullrod/whip name = "holy whip" - desc = "What a terrible night to be on Space Station 13." + desc = "What a terrible night to be on the Cyberiad!" icon_state = "chain" item_state = "chain" slot_flags = SLOT_BELT From 7be3d5baf69c62db2358316e32dab015ff6c8dc9 Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 18 Apr 2017 20:06:47 +0100 Subject: [PATCH 2/8] Enables more burnable wood objects --- code/game/machinery/deployable.dm | 2 ++ code/game/objects/structures/dresser.dm | 2 ++ 2 files changed, 4 insertions(+) diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index 3ba162678ea..8558682205d 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -136,6 +136,8 @@ for reference: icon = 'icons/obj/structures.dmi' icon_state = "woodenbarricade" stacktype = /obj/item/stack/sheet/wood + burn_state = FLAMMABLE + burntime = 25 /obj/structure/barricade/mime name = "floor" diff --git a/code/game/objects/structures/dresser.dm b/code/game/objects/structures/dresser.dm index cc09bfb1f8a..a711e6c2049 100644 --- a/code/game/objects/structures/dresser.dm +++ b/code/game/objects/structures/dresser.dm @@ -5,6 +5,8 @@ icon_state = "dresser" density = 1 anchored = 1 + burn_state = FLAMMABLE + burntime = 25 /obj/structure/dresser/attack_hand(mob/user as mob) if(!Adjacent(user))//no tele-grooming From d1f43dbd9ab639060cb266161ce8d568ff964a01 Mon Sep 17 00:00:00 2001 From: Sam Date: Sun, 23 Apr 2017 02:41:01 +0100 Subject: [PATCH 3/8] Dresser is constructible and moveable. --- .../items/stacks/sheets/sheet_types.dm | 1 + code/game/objects/structures/dresser.dm | 33 +++++++++++++++++-- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index fd7d10c6612..bfac425ebd9 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -154,6 +154,7 @@ var/global/list/datum/stack_recipe/wood_recipes = list( new /datum/stack_recipe("wooden chair", /obj/structure/stool/bed/chair/wood/normal, 3, time = 10, one_per_turf = 1, on_floor = 1), new /datum/stack_recipe("wooden barricade", /obj/structure/barricade/wooden, 5, time = 50, one_per_turf = 1, on_floor = 1), new /datum/stack_recipe("bookcase", /obj/structure/bookcase, 5, time = 50, one_per_turf = 1, on_floor = 1), + new /datum/stack_recipe("dresser", /obj/structure/dresser, 30, time = 50, one_per_turf = 1, on_floor = 1), new /datum/stack_recipe("drying rack", /obj/machinery/smartfridge/drying_rack, 10, time = 15, one_per_turf = 1, on_floor = 1), new /datum/stack_recipe("dog bed", /obj/structure/stool/bed/dogbed, 10, time = 10, one_per_turf = 1, on_floor = 1), \ new /datum/stack_recipe("rifle stock", /obj/item/weaponcrafting/stock, 10, time = 40), diff --git a/code/game/objects/structures/dresser.dm b/code/game/objects/structures/dresser.dm index a711e6c2049..e8d72b600fe 100644 --- a/code/game/objects/structures/dresser.dm +++ b/code/game/objects/structures/dresser.dm @@ -11,7 +11,7 @@ /obj/structure/dresser/attack_hand(mob/user as mob) if(!Adjacent(user))//no tele-grooming return - if(ishuman(user)) + if(ishuman(user) && anchored) var/mob/living/carbon/human/H = user var/choice = input(user, "Underwear, Undershirt, or Socks?", "Changing") as null|anything in list("Underwear","Undershirt","Socks") @@ -53,4 +53,33 @@ H.socks = new_socks add_fingerprint(H) - H.update_body() \ No newline at end of file + H.update_body() + +/obj/structure/dresser/attackby(obj/item/weapon/W, mob/living/user, params) + add_fingerprint(user) + user.changeNext_move(CLICK_CD_MELEE) + if(iswrench(W)) + if(anchored) + playsound(loc, W.usesound, 100, 1) + user.visible_message("[user] is loosening the [name]'s bolts.", \ + "You are loosening the [name]'s bolts...") + if(do_after(user, 40 * W.toolspeed, target = src)) + if(!loc || !anchored) + return + user.visible_message("[user] loosened the [name]'s bolts!", \ + "You loosen the [name]'s bolts!") + anchored = 0 + else + if(!isfloorturf(loc)) + user.visible_message("A floor must be present to secure the [name]!") + return + playsound(loc, W.usesound, 100, 1) + user.visible_message("[user] is securing the [name]'s bolts...", \ + "You are securing the [name]'s bolts...") + if(do_after(user, 40 * W.toolspeed, target = src)) + if(!loc || anchored) + return + user.visible_message("[user] has secured the [name]'s bolts.", \ + "You have secured the [name]'s bolts.") + anchored = 1 +// return ..() \ No newline at end of file From 99421f72d3c073ac350ab71368a6af82a666ea1d Mon Sep 17 00:00:00 2001 From: Sam Date: Sun, 23 Apr 2017 03:06:07 +0100 Subject: [PATCH 4/8] Oh, and deconstructed. --- code/game/objects/structures/dresser.dm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/code/game/objects/structures/dresser.dm b/code/game/objects/structures/dresser.dm index e8d72b600fe..3747eb59fe3 100644 --- a/code/game/objects/structures/dresser.dm +++ b/code/game/objects/structures/dresser.dm @@ -82,4 +82,11 @@ user.visible_message("[user] has secured the [name]'s bolts.", \ "You have secured the [name]'s bolts.") anchored = 1 -// return ..() \ No newline at end of file + else + if(iscrowbar(W) && !anchored) + playsound(loc, W.usesound, 100, 1) + user.visible_message("[user] is attempting to dismantle the [name].", \ + "You begin to dismantle the [name]...") + if(do_after(user, 40 * W.toolspeed, target = src)) + new /obj/item/stack/sheet/wood (loc, 30) + qdel(src) From 6316f945d0e12255e666bea6922f31c67ef453ef Mon Sep 17 00:00:00 2001 From: Sam Date: Sun, 23 Apr 2017 06:26:43 +0100 Subject: [PATCH 5/8] Uses [src] instead of [name] --- code/game/objects/structures/dresser.dm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/code/game/objects/structures/dresser.dm b/code/game/objects/structures/dresser.dm index 3747eb59fe3..db5cf7f9a82 100644 --- a/code/game/objects/structures/dresser.dm +++ b/code/game/objects/structures/dresser.dm @@ -61,32 +61,32 @@ if(iswrench(W)) if(anchored) playsound(loc, W.usesound, 100, 1) - user.visible_message("[user] is loosening the [name]'s bolts.", \ - "You are loosening the [name]'s bolts...") + user.visible_message("[user] is loosening the [src]'s bolts.", \ + "You are loosening the [src]'s bolts...") if(do_after(user, 40 * W.toolspeed, target = src)) if(!loc || !anchored) return - user.visible_message("[user] loosened the [name]'s bolts!", \ - "You loosen the [name]'s bolts!") + user.visible_message("[user] loosened the [src]'s bolts!", \ + "You loosen the [src]'s bolts!") anchored = 0 else if(!isfloorturf(loc)) user.visible_message("A floor must be present to secure the [name]!") return playsound(loc, W.usesound, 100, 1) - user.visible_message("[user] is securing the [name]'s bolts...", \ - "You are securing the [name]'s bolts...") + user.visible_message("[user] is securing the [src]'s bolts...", \ + "You are securing the [src]'s bolts...") if(do_after(user, 40 * W.toolspeed, target = src)) if(!loc || anchored) return - user.visible_message("[user] has secured the [name]'s bolts.", \ - "You have secured the [name]'s bolts.") + user.visible_message("[user] has secured the [src]'s bolts.", \ + "You have secured the [src]'s bolts.") anchored = 1 else if(iscrowbar(W) && !anchored) playsound(loc, W.usesound, 100, 1) - user.visible_message("[user] is attempting to dismantle the [name].", \ - "You begin to dismantle the [name]...") + user.visible_message("[user] is attempting to dismantle the [src].", \ + "You begin to dismantle the [src]...") if(do_after(user, 40 * W.toolspeed, target = src)) new /obj/item/stack/sheet/wood (loc, 30) qdel(src) From 9e30dfbdf7e9d3bf85c92ad8a9f525d324357589 Mon Sep 17 00:00:00 2001 From: Sam Date: Sun, 7 May 2017 09:10:59 +0100 Subject: [PATCH 6/8] Holy whip now references the station --- code/game/objects/items/weapons/holy_weapons.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm index 375b24247ab..a6a1039f1c7 100644 --- a/code/game/objects/items/weapons/holy_weapons.dm +++ b/code/game/objects/items/weapons/holy_weapons.dm @@ -283,13 +283,17 @@ /obj/item/weapon/nullrod/whip name = "holy whip" - desc = "What a terrible night to be on the Cyberiad!" + desc = "What a terrible night to be in spess" icon_state = "chain" item_state = "chain" slot_flags = SLOT_BELT attack_verb = list("whipped", "lashed") hitsound = 'sound/weapons/slash.ogg' +/obj/item/weapon/nullrod/whip/New() + ..() + desc = "What a terrible night to be on the [station_name()]." + /obj/item/weapon/nullrod/whip/afterattack(atom/movable/AM, mob/user, proximity) if(!proximity) return From 818ca57be61e1eaa1e094c0cf1cbfba7356b0a7b Mon Sep 17 00:00:00 2001 From: Sam Date: Sun, 7 May 2017 09:20:11 +0100 Subject: [PATCH 7/8] Byond's grammatical helper thing is cool --- code/game/objects/structures/dresser.dm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/code/game/objects/structures/dresser.dm b/code/game/objects/structures/dresser.dm index db5cf7f9a82..9d501142c57 100644 --- a/code/game/objects/structures/dresser.dm +++ b/code/game/objects/structures/dresser.dm @@ -61,32 +61,32 @@ if(iswrench(W)) if(anchored) playsound(loc, W.usesound, 100, 1) - user.visible_message("[user] is loosening the [src]'s bolts.", \ - "You are loosening the [src]'s bolts...") + user.visible_message("[user] is loosening [src]'s bolts.", \ + "You are loosening [src]'s bolts...") if(do_after(user, 40 * W.toolspeed, target = src)) if(!loc || !anchored) return - user.visible_message("[user] loosened the [src]'s bolts!", \ - "You loosen the [src]'s bolts!") + user.visible_message("[user] loosened [src]'s bolts!", \ + "You loosen [src]'s bolts!") anchored = 0 else if(!isfloorturf(loc)) - user.visible_message("A floor must be present to secure the [name]!") + user.visible_message("A floor must be present to secure [name]!") return playsound(loc, W.usesound, 100, 1) - user.visible_message("[user] is securing the [src]'s bolts...", \ - "You are securing the [src]'s bolts...") + user.visible_message("[user] is securing [src]'s bolts...", \ + "You are securing [src]'s bolts...") if(do_after(user, 40 * W.toolspeed, target = src)) if(!loc || anchored) return - user.visible_message("[user] has secured the [src]'s bolts.", \ - "You have secured the [src]'s bolts.") + user.visible_message("[user] has secured [src]'s bolts.", \ + "You have secured [src]'s bolts.") anchored = 1 else if(iscrowbar(W) && !anchored) playsound(loc, W.usesound, 100, 1) - user.visible_message("[user] is attempting to dismantle the [src].", \ - "You begin to dismantle the [src]...") + user.visible_message("[user] is attempting to dismantle [src].", \ + "You begin to dismantle [src]...") if(do_after(user, 40 * W.toolspeed, target = src)) new /obj/item/stack/sheet/wood (loc, 30) qdel(src) From 5e6ae560d6a6a81c429015c2293b4a6fd811f57a Mon Sep 17 00:00:00 2001 From: Sam Date: Sun, 7 May 2017 23:10:13 +0100 Subject: [PATCH 8/8] Fixing errant reference --- code/game/objects/structures/dresser.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/dresser.dm b/code/game/objects/structures/dresser.dm index 9d501142c57..6d35a6aee21 100644 --- a/code/game/objects/structures/dresser.dm +++ b/code/game/objects/structures/dresser.dm @@ -71,7 +71,7 @@ anchored = 0 else if(!isfloorturf(loc)) - user.visible_message("A floor must be present to secure [name]!") + user.visible_message("A floor must be present to secure [src]!") return playsound(loc, W.usesound, 100, 1) user.visible_message("[user] is securing [src]'s bolts...", \