Merge pull request #12939 from KorPhaeron/really_bad_ideas

Adds a series of ridiculous weapons to the wizard spellbook

code/game/gamemodes/wizard/spellbook.dm

@@ -350,6 +350,34 @@
 	limit = 3
 	category = "Assistance"
 
+/datum/spellbook_entry/item/super_matter
+	name = "Super Matter Sword"
+	desc = "Buying this is an incredibly bad idea. The radiation will kill you within minutes. Please consider other options."
+	item_path = /obj/item/weapon/melee/supermatter_sword
+	log_name = "SX"
+	category = "Weapons"
+
+/datum/spellbook_entry/item/veil_render
+	name = "Veil Render"
+	desc = "A sword that can cut through reality itself, leading to mass destruction. Remember to run after you use it!"
+	item_path = /obj/item/weapon/veilrender
+	log_name = "VR"
+	category = "Weapons"
+
+/datum/spellbook_entry/item/mjolnir
+	name = "Mjolnir"
+	desc = "A mighty hammer on loan from Thor, God of Thunder. It crackles with barely contained power."
+	item_path = /obj/item/weapon/twohanded/mjollnir
+	log_name = "MJ"
+	category = "Weapons"
+
+/datum/spellbook_entry/item/singularity_hammer
+	name = "Singularity Hammer"
+	desc = "A hammer that creates an intensely powerful field of gravity where it strikes, pulling everthing nearby to the point of impact."
+	item_path = /obj/item/weapon/twohanded/singularityhammer
+	log_name = "SI"
+	category = "Weapons"
+
 /datum/spellbook_entry/summon
 	name = "Summon Stuff"
 	category = "Rituals"
@@ -437,7 +465,26 @@
 		. += "You cast it [times] times.<br>"
 	return .
 
+/datum/spellbook_entry/summon/multisword
+	name = "Multiverse War"
+	category = "Rituals"
+	desc = "Triggers a multiverse war in which the crew (and you) must summon copies of yourself from alternate realities to do battle and hijack the emergency shuttle. Automatically triggers a shuttle call on purchase."
+	log_name = "MW"
+	cost = 8
 
+/datum/spellbook_entry/summon/multisword/IsAvailible()
+	if(!ticker.mode) // In case spellbook is placed on map
+		return 0
+	return (ticker.mode.name != "ragin' mages" && !config.no_summon_magic)
+
+/datum/spellbook_entry/summon/multisword/Buy(mob/living/carbon/human/user,obj/item/weapon/spellbook/book)
+	feedback_add_details("wizard_spell_learned",log_name)
+	only_me()
+	new /obj/item/weapon/multisword(get_turf(user)) //Because the proc skips special roles
+	SSshuttle.emergency.request()
+	playsound(get_turf(user),"sound/magic/CastSummon.ogg",50,1)
+	user << "<span class='notice'>You have triggerd a multiverse war!</span>"
+	return 1
 
 /obj/item/weapon/spellbook
 	name = "spell book"

code/game/objects/items/weapons/singularityhammer.dm

@@ -71,14 +71,14 @@
 
 
 /obj/item/weapon/twohanded/mjollnir
-	name = "Mjollnir"
+	name = "Mjolnir"
 	desc = "A weapon worthy of a god, able to strike with the force of a lightning bolt. It crackles with barely contained energy."
 	icon_state = "mjollnir0"
 	flags = CONDUCT
 	slot_flags = SLOT_BACK
 	force = 5
 	force_unwielded = 5
-	force_wielded = 20
+	force_wielded = 25
 	throwforce = 30
 	throw_range = 7
 	w_class = 5
@@ -89,7 +89,6 @@
 	var/datum/effect_system/lightning_spread/s = new /datum/effect_system/lightning_spread
 	s.set_up(5, 1, target.loc)
 	s.start()
-	target.take_organ_damage(0,30)
 	target.visible_message("<span class='danger'>[target.name] was shocked by the [src.name]!</span>", \
 		"<span class='userdanger'>You feel a powerful shock course through your body sending you flying!</span>", \
 		"<span class='italics'>You hear a heavy electrical crack!</span>")
@@ -106,9 +105,15 @@
 		//charged = 0
 		playsound(src.loc, "sparks", 50, 1)
 		if(istype(M, /mob/living))
-			M.Stun(10)
+			M.Stun(3)
 			shock(M)
 
+/obj/item/weapon/twohanded/mjollnir/throw_impact(atom/target)
+	. = ..()
+	if(istype(target, /mob/living))
+		var/mob/living/L = target
+		L.Stun(3)
+		shock(L)
 
 /obj/item/weapon/twohanded/mjollnir/update_icon()  //Currently only here to fuck with the on-mob icons.
 	icon_state = "mjollnir[wielded]"

code/modules/admin/secrets.dm

@@ -553,7 +553,7 @@
 				return
 			feedback_inc("admin_secrets_fun_used",1)
 			feedback_add_details("admin_secrets_fun_used","OM")
-			usr.client.only_me()
+			only_me()
 
 		if("maint_access_brig")
 			if(!check_rights(R_DEBUG))

code/modules/admin/verbs/onlyone.dm

@@ -50,7 +50,7 @@
 	log_admin("[key_name(usr)] used there can be only one.")
 
 
-/client/proc/only_me()
+/proc/only_me()
 	if(!ticker || !ticker.mode)
 		alert("The game hasn't started yet!")
 		return

html/changelogs/Kor-BLADES.yml

@@ -0,0 +1,40 @@
+################################
+# 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
+#   spellcheck (typo fixes)
+#   experiment
+#   tgs (TG-ported fixes?)
+#################################
+
+# Your name.  
+author: Kor
+
+# 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, this gets changed to [] after reading.  Just remove the brackets when you add new shit.
+# Please surround your changes in  double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - rscadd: "The Mjolnir has been added to the wizards spellbook."
+  - rscadd: "The Singularity Hammer has been added to the wizards spellbook."
+  - rscadd: "The Supermatter Sword has been added to the wizards spellbook."
+  - rscadd: "The Veil Render has been added to the wizards spellbook."
+  - rscadd: "Trigger Multiverse War (give the entire crew multiswords) has been added to the wizards spellbook, at a cost of 8 points."