Merge branch 'master' into w_class

Conflicts: code/game/objects/items/weapons/twohanded.dm
2026-08-28 15:47:15 +01:00 · 2016-12-02 21:44:24 -08:00
parent 19513c398c ca6ffdba40
commit c2e2440953
95 changed files with 272 additions and 162 deletions
@@ -87,7 +87,7 @@ var/list/hardcoded_gases = list("o2","n2","co2","plasma") //the main four gases,
 	specific_heat = 20
 	name = "BZ"

-/obj/effect/overlay/gas/
+/obj/effect/overlay/gas
 	icon = 'icons/effects/tile_effects.dmi'
 	mouse_opacity = 0
 	layer = FLY_LAYER
@@ -3,7 +3,7 @@
 /datum/round_event_control/wizard/robelesscasting //EI NUDTH!
 	name = "Robeless Casting"
 	weight = 2
-	typepath = /datum/round_event/wizard/robelesscasting/
+	typepath = /datum/round_event/wizard/robelesscasting
 	max_occurrences = 1
 	earliest_start = 0

@@ -24,7 +24,7 @@
 /datum/round_event_control/wizard/improvedcasting //blink x5 disintergrate x5 here I come!
 	name = "Improved Casting"
 	weight = 3
-	typepath = /datum/round_event/wizard/improvedcasting/
+	typepath = /datum/round_event/wizard/improvedcasting
 	max_occurrences = 4 //because that'd be max level spells
 	earliest_start = 0

@@ -1,7 +1,7 @@
 /datum/round_event_control/wizard/blobies //avast!
 	name = "Zombie Outbreak"
 	weight = 3
-	typepath = /datum/round_event/wizard/blobies/
+	typepath = /datum/round_event/wizard/blobies
 	max_occurrences = 3
 	earliest_start = 12000 // 20 minutes (gotta get some bodies made!)

@@ -1,7 +1,7 @@
 /datum/round_event_control/wizard/cursed_items //fashion disasters
 	name = "Cursed Items"
 	weight = 3
-	typepath = /datum/round_event/wizard/cursed_items/
+	typepath = /datum/round_event/wizard/cursed_items
 	max_occurrences = 3
 	earliest_start = 0

@@ -24,7 +24,7 @@
 		if("swords")
 			loadout[5] = /obj/item/weapon/katana/cursed
 		if("bigfatdoobie")
-			loadout[4] = /obj/item/clothing/mask/cigarette/rollie/trippy/
+			loadout[4] = /obj/item/clothing/mask/cigarette/rollie/trippy
 			ruins_spaceworthiness = 1
 		if("boxing")
 			loadout[4] = /obj/item/clothing/mask/luchador
@@ -1,7 +1,7 @@
 /datum/round_event_control/wizard/deprevolt //stationwide!
 	name = "Departmental Uprising"
 	weight = 0 //An order that requires order in a round of chaos was maybe not the best idea. Requiescat in pace departmental uprising August 2014 - March 2015
-	typepath = /datum/round_event/wizard/deprevolt/
+	typepath = /datum/round_event/wizard/deprevolt
 	max_occurrences = 1
 	earliest_start = 0

@@ -1,7 +1,7 @@
 /datum/round_event_control/wizard/fake_explosion //Oh no the station is gone!
 	name = "Fake Nuclear Explosion"
 	weight = 0 //Badmin exclusive now because once it's expected its not funny
-	typepath = /datum/round_event/wizard/fake_explosion/
+	typepath = /datum/round_event/wizard/fake_explosion
 	max_occurrences = 1
 	earliest_start = 0

@@ -1,7 +1,7 @@
 /datum/round_event_control/wizard/ghost //The spook is real
 	name = "G-G-G-Ghosts!"
 	weight = 3
-	typepath = /datum/round_event/wizard/ghost/
+	typepath = /datum/round_event/wizard/ghost
 	max_occurrences = 5
 	earliest_start = 0

@@ -1,7 +1,7 @@
 /datum/round_event_control/wizard/greentext //Gotta have it!
 	name = "Greentext"
 	weight = 4
-	typepath = /datum/round_event/wizard/greentext/
+	typepath = /datum/round_event/wizard/greentext
 	max_occurrences = 1
 	earliest_start = 0

@@ -1,7 +1,7 @@
 /datum/round_event_control/wizard/imposter //Mirror Mania
 	name = "Imposter Wizard"
 	weight = 1
-	typepath = /datum/round_event/wizard/imposter/
+	typepath = /datum/round_event/wizard/imposter
 	max_occurrences = 1
 	earliest_start = 0

@@ -1,7 +1,7 @@
 /datum/round_event_control/wizard/invincible //Boolet Proof
 	name = "Invincibility"
 	weight = 3
-	typepath = /datum/round_event/wizard/invincible/
+	typepath = /datum/round_event/wizard/invincible
 	max_occurrences = 5
 	earliest_start = 0

@@ -1,11 +1,11 @@
 /datum/round_event_control/wizard/lava //THE LEGEND NEVER DIES
 	name = "The Floor Is LAVA!"
 	weight = 2
-	typepath = /datum/round_event/wizard/lava/
+	typepath = /datum/round_event/wizard/lava
 	max_occurrences = 3
 	earliest_start = 0

-/datum/round_event/wizard/lava/
+/datum/round_event/wizard/lava
 	endWhen = 0
 	var/started = FALSE

@@ -1,11 +1,11 @@
 /datum/round_event_control/wizard/magicarp //these fish is loaded
 	name = "Magicarp"
 	weight = 1
-	typepath = /datum/round_event/wizard/magicarp/
+	typepath = /datum/round_event/wizard/magicarp
 	max_occurrences = 1
 	earliest_start = 0

-/datum/round_event/wizard/magicarp/
+/datum/round_event/wizard/magicarp
 	announceWhen	= 3
 	startWhen = 50

@@ -1,11 +1,11 @@
 /datum/round_event_control/wizard/petsplosion //the horror
 	name = "Petsplosion"
 	weight = 2
-	typepath = /datum/round_event/wizard/petsplosion/
+	typepath = /datum/round_event/wizard/petsplosion
 	max_occurrences = 1 //Exponential growth is nothing to sneeze at!
 	earliest_start = 0

-/datum/round_event/wizard/petsplosion/
+/datum/round_event/wizard/petsplosion
 	endWhen = 61 //1 minute (+1 tick for endWhen not to interfere with tick)
 	var/countdown = 0

@@ -1,7 +1,7 @@
 /datum/round_event_control/wizard/race //Lizard Wizard? Lizard Wizard.
 	name = "Race Swap"
 	weight = 2
-	typepath = /datum/round_event/wizard/race/
+	typepath = /datum/round_event/wizard/race
 	max_occurrences = 5
 	earliest_start = 0

@@ -1,7 +1,7 @@
 /datum/round_event_control/wizard/rpgloot //its time to minmax your shit
 	name = "RPG Loot"
 	weight = 3
-	typepath = /datum/round_event/wizard/rpgloot/
+	typepath = /datum/round_event/wizard/rpgloot
 	max_occurrences = 1
 	earliest_start = 0

@@ -4,7 +4,7 @@
 /datum/round_event_control/wizard/shuffleloc //Somewhere an AI is crying
 	name = "Change Places!"
 	weight = 2
-	typepath = /datum/round_event/wizard/shuffleloc/
+	typepath = /datum/round_event/wizard/shuffleloc
 	max_occurrences = 5
 	earliest_start = 0

@@ -40,7 +40,7 @@
 /datum/round_event_control/wizard/shufflenames //Face/off joke
 	name = "Change Faces!"
 	weight = 4
-	typepath = /datum/round_event/wizard/shufflenames/
+	typepath = /datum/round_event/wizard/shufflenames
 	max_occurrences = 5
 	earliest_start = 0

@@ -74,7 +74,7 @@
 /datum/round_event_control/wizard/shuffleminds //Basically Mass Ranged Mindswap
 	name = "Change Minds!"
 	weight = 1
-	typepath = /datum/round_event/wizard/shuffleminds/
+	typepath = /datum/round_event/wizard/shuffleminds
 	max_occurrences = 3
 	earliest_start = 0

@@ -91,7 +91,7 @@

 	shuffle(mobs)

-	var/obj/effect/proc_holder/spell/targeted/mind_transfer/swapper = new /obj/effect/proc_holder/spell/targeted/mind_transfer/
+	var/obj/effect/proc_holder/spell/targeted/mind_transfer/swapper = new /obj/effect/proc_holder/spell/targeted/mind_transfer
 	while(mobs.len > 1)
 		var/mob/living/carbon/human/H = pick(mobs)
 		mobs -= H
@@ -1,7 +1,7 @@
 /datum/round_event_control/wizard/summonguns //The Classic
 	name = "Summon Guns"
 	weight = 1
-	typepath = /datum/round_event/wizard/summonguns/
+	typepath = /datum/round_event/wizard/summonguns
 	max_occurrences = 1
 	earliest_start = 0

@@ -16,7 +16,7 @@
 /datum/round_event_control/wizard/summonmagic //The Somewhat Less Classic
 	name = "Summon Magic"
 	weight = 1
-	typepath = /datum/round_event/wizard/summonmagic/
+	typepath = /datum/round_event/wizard/summonmagic
 	max_occurrences = 1
 	earliest_start = 0

@@ -11,7 +11,7 @@ Gunshots/explosions/opening doors/less rare audio (done)

 */

-/mob/living/carbon/
+/mob/living/carbon
 	var/image/halimage
 	var/image/halbody
 	var/obj/halitem
@@ -488,7 +488,7 @@
 /datum/chemical_reaction/grape_soda
 	name = "grape soda"
 	id = "grapesoda"
-	results = list("grape_soda" = 2)
+	results = list("grapesoda" = 2)
 	required_reagents = list("grapejuice" = 1, "sodawater" = 1)

 /datum/chemical_reaction/grappa
@@ -150,7 +150,7 @@
 			H.visible_message("<span class='danger'>[H] steps on a cactus!</span>", \
 				"<span class='userdanger'>You step on a cactus!</span>")

-/obj/item/weapon/reagent_containers/food/snacks/ash_flora/
+/obj/item/weapon/reagent_containers/food/snacks/ash_flora
 	name = "mushroom shavings"
 	desc = "Some shavings from a tall mushroom. With enough, might serve as a bowl."
 	icon = 'icons/obj/lavaland/ash_flora.dmi'
@@ -55,7 +55,7 @@
 		new /datum/data/mining_equipment("Jump Boots",			/obj/item/clothing/shoes/bhop,											2500),
 		)

-/datum/data/mining_equipment/
+/datum/data/mining_equipment
 	var/equipment_name = "generic"
 	var/equipment_path = null
 	var/cost = 0
@@ -10,7 +10,7 @@
 	gender = FEMALE //All xenos are girls!!
 	dna = null
 	faction = list("alien")
-	ventcrawler = 2
+	ventcrawler = VENTCRAWLER_ALWAYS
 	languages_spoken = ALIEN
 	languages_understood = ALIEN
 	sight = SEE_MOBS
@@ -2,7 +2,7 @@
 	//Common stuffs for Praetorian and Queen
 	icon = 'icons/mob/alienqueen.dmi'
 	status_flags = 0
-	ventcrawler = 0 //pull over that ass too fat
+	ventcrawler = VENTCRAWLER_NONE //pull over that ass too fat
 	unique_name = 0
 	pixel_x = -16
 	bubble_icon = "alienroyal"
@@ -31,7 +31,7 @@
 	var/co2overloadtime = null
 	var/temperature_resistance = T0C+75
 	has_limbs = 1
-	var/obj/item/weapon/reagent_containers/food/snacks/meat/slab/type_of_meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/
+	var/obj/item/weapon/reagent_containers/food/snacks/meat/slab/type_of_meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab

 	var/list/obj/effect/proc_holder/alien/abilities = list()
 	var/gib_type = /obj/effect/decal/cleanable/blood/gibs
@@ -908,7 +908,7 @@
 	var/mob/living/carbon/human/H = owner
 	H.visible_message("<span class='warning'>[H] starts vibrating!</span>", "<span class='danger'>You start charging your bluespace core...</span>")
 	playsound(get_turf(H), 'sound/weapons/flash.ogg', 25, 1)
-	addtimer(src, "teleport", 15)
+	addtimer(src, "teleport", 15, TIMER_NORMAL, H)

 /datum/action/innate/unstable_teleport/proc/teleport(mob/living/carbon/human/H)
 	H.visible_message("<span class='warning'>[H] disappears in a shower of sparks!</span>", "<span class='danger'>You teleport!</span>")
@@ -8,7 +8,7 @@
 	pass_flags = PASSTABLE
 	languages_spoken = MONKEY
 	languages_understood = MONKEY
-	ventcrawler = 1
+	ventcrawler = VENTCRAWLER_NUDE
 	butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat/slab/monkey = 5, /obj/item/stack/sheet/animalhide/monkey = 1)
 	type_of_meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/monkey
 	gib_type = /obj/effect/decal/cleanable/blood/gibs
@@ -16,7 +16,7 @@
 	density = 0
 	movement_type = FLYING
 	pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
-	ventcrawler = 2
+	ventcrawler = VENTCRAWLER_ALWAYS
 	mob_size = MOB_SIZE_TINY
 	gold_core_spawnable = 2
 	verb_say = "flutters"
@@ -14,7 +14,7 @@
 	speak_chance = 1
 	turns_per_move = 5
 	see_in_dark = 6
-	ventcrawler = 2
+	ventcrawler = VENTCRAWLER_ALWAYS
 	pass_flags = PASSTABLE
 	mob_size = MOB_SIZE_SMALL
 	minbodytemp = 200
@@ -17,7 +17,7 @@
 	response_disarm = "shoos"
 	response_harm   = "splats"
 	density = 0
-	ventcrawler = 2
+	ventcrawler = VENTCRAWLER_ALWAYS
 	gold_core_spawnable = 2
 	var/squish_chance = 50
 	loot = list(/obj/effect/decal/cleanable/deadcockroach)
@@ -16,7 +16,7 @@
 	response_harm   = "stomps"
 	stop_automated_movement = 1
 	friendly = "pinches"
-	ventcrawler = 2
+	ventcrawler = VENTCRAWLER_ALWAYS
 	var/obj/item/inventory_head
 	var/obj/item/inventory_mask
 	gold_core_spawnable = 2
@@ -27,7 +27,7 @@
 	unsuitable_atmos_damage = 0
 	wander = 0
 	speed = 0
-	ventcrawler = 2
+	ventcrawler = VENTCRAWLER_ALWAYS
 	healable = 0
 	density = 0
 	pass_flags = PASSTABLE | PASSMOB
@@ -104,7 +104,7 @@
 	harm_intent_damage = 5
 	density = TRUE
 	speed = 1
-	ventcrawler = 0
+	ventcrawler = VENTCRAWLER_NONE
 	faction = list("ratvar")
 	speak_emote = list("clanks", "clinks", "clunks", "clangs")
 	verb_ask = "requests"
@@ -140,7 +140,7 @@
 		hacked = 1
 		mind.special_role = "hacked drone"
 		seeStatic = 0 //I MUST SEE THEIR TERRIFIED FACES
-		ventcrawler = 0 //Again, balance
+		ventcrawler = VENTCRAWLER_NONE //Again, balance
 		speed = 1 //gotta go slow
 		message_admins("[src] ([src.key]) became a hacked drone hellbent on [clockwork ? "serving Ratvar" : "destroying the station"]!")
 	else
@@ -175,7 +175,7 @@
 	attacktext = "kicks"
 	health = 3
 	maxHealth = 3
-	ventcrawler = 2
+	ventcrawler = VENTCRAWLER_ALWAYS
 	var/amount_grown = 0
 	pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
 	mob_size = MOB_SIZE_TINY
@@ -226,7 +226,7 @@ var/global/chicken_count = 0
 	attacktext = "kicks"
 	health = 15
 	maxHealth = 15
-	ventcrawler = 2
+	ventcrawler = VENTCRAWLER_ALWAYS
 	var/eggsleft = 0
 	var/eggsFertile = TRUE
 	var/body_color
@@ -14,7 +14,7 @@
 	response_help  = "pets"
 	response_disarm = "shoos"
 	response_harm   = "stomps on"
-	ventcrawler = 2
+	ventcrawler = VENTCRAWLER_ALWAYS
 	density = 0
 	pass_flags = PASSTABLE | PASSMOB
 	mob_size = MOB_SIZE_SMALL
@@ -18,7 +18,7 @@
 	response_disarm = "gently pushes aside"
 	response_harm   = "splats"
 	density = 0
-	ventcrawler = 2
+	ventcrawler = VENTCRAWLER_ALWAYS
 	pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
 	mob_size = MOB_SIZE_TINY
 	var/body_color //brown, gray and white, leave blank for random
@@ -42,7 +42,7 @@
 	var/busy = 0
 	pass_flags = PASSTABLE
 	move_to_delay = 6
-	ventcrawler = 2
+	ventcrawler = VENTCRAWLER_ALWAYS
 	attacktext = "bites"
 	attack_sound = 'sound/weapons/bite.ogg'
 	unique_name = 1
@@ -19,7 +19,7 @@
 	obj_damage = 0
 	environment_smash = 0
 	speak_emote = list("squeaks")
-	ventcrawler = 2
+	ventcrawler = VENTCRAWLER_ALWAYS
 	var/datum/mind/origin
 	var/egg_lain = 0
 	gold_core_spawnable = 1 //are you sure about this??
@@ -18,7 +18,7 @@
 	melee_damage_upper = 12
 	attacktext = "slams"
 	attack_sound = 'sound/weapons/punch1.ogg'
-	ventcrawler = 2
+	ventcrawler = VENTCRAWLER_ALWAYS
 	faction = list("plants")

 	atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
@@ -608,7 +608,7 @@ Difficulty: Very Hard
 	density = 0
 	movement_type = FLYING
 	pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
-	ventcrawler = 2
+	ventcrawler = VENTCRAWLER_ALWAYS
 	mob_size = MOB_SIZE_TINY
 	gold_core_spawnable = 0
 	verb_say = "warps"
@@ -1,4 +1,4 @@
-/mob/living/simple_animal/hostile/asteroid/
+/mob/living/simple_animal/hostile/asteroid
 	vision_range = 2
 	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
 	faction = list("mining")
@@ -479,7 +479,7 @@
 	if(icon_state != icon_aggro)
 		icon_state = icon_aggro

-/obj/effect/goliath_tentacle/
+/obj/effect/goliath_tentacle
 	name = "Goliath tentacle"
 	icon = 'icons/mob/lavaland/lavaland_monsters.dmi'
 	icon_state = "Goliath_tentacle"
@@ -875,7 +875,7 @@
 	response_harm   = "squishes"
 	friendly = "pinches"
 	a_intent = "help"
-	ventcrawler = 2
+	ventcrawler = VENTCRAWLER_ALWAYS
 	gold_core_spawnable = 2
 	stat_attack = 1
 	gender = NEUTER
@@ -24,7 +24,7 @@
 	stat_attack = 2
 	mouse_opacity = 1
 	speed = 1
-	ventcrawler = 2
+	ventcrawler = VENTCRAWLER_ALWAYS
 	robust_searching = 1
 	unique_name = 1
 	speak_emote = list("squeaks")
@@ -23,7 +23,7 @@
 	attack_sound = 'sound/weapons/bite.ogg'
 	obj_damage = 0
 	environment_smash = 0
-	ventcrawler = 2
+	ventcrawler = VENTCRAWLER_ALWAYS
 	mob_size = MOB_SIZE_TINY
 	movement_type = FLYING
 	speak_emote = list("squeaks")
@@ -17,7 +17,7 @@
 	response_disarm = "pokes"
 	response_harm   = "splats"
 	density = 0
-	ventcrawler = 2
+	ventcrawler = VENTCRAWLER_ALWAYS
 	faction = list("hostile")
 	attack_sound = 'sound/effects/Reee.ogg'
 	butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/nugget = 1)
@@ -29,7 +29,7 @@
 	faction = list("hostile","stickman")
 	check_friendly_fire = 1
 	status_flags = CANPUSH
-	var/datum/action/boss/wizard_summon_minions/changesummons = /datum/action/boss/wizard_summon_minions/
+	var/datum/action/boss/wizard_summon_minions/changesummons = /datum/action/boss/wizard_summon_minions
 	var/summoned_by_wizard = 0

 /mob/living/simple_animal/hostile/stickman/ranged
@@ -9,7 +9,7 @@ var/list/slime_colours = list("rainbow", "grey", "purple", "metal", "orange",
 	icon = 'icons/mob/slimes.dmi'
 	icon_state = "grey baby slime"
 	pass_flags = PASSTABLE
-	ventcrawler = 2
+	ventcrawler = VENTCRAWLER_ALWAYS
 	gender = NEUTER
 	var/is_adult = 0
 	var/docile = 0
@@ -302,6 +302,10 @@ var/next_mob_id = 0
 		return
 	if(AM.anchored || AM.throwing)
 		return
+	if(isliving(AM))
+		var/mob/living/L = AM
+		if(L.buckled && L.buckled.buckle_prevents_pull)
+			return
 	if(throwing || incapacitated())
 		return

@@ -309,14 +309,19 @@

 //moves the mob/object we're pulling
 /mob/proc/Move_Pulled(atom/A)
-	if (!pulling)
+	if(!pulling)
 		return
-	if (pulling.anchored || !pulling.Adjacent(src))
+	if(pulling.anchored || !pulling.Adjacent(src))
 		stop_pulling()
 		return
-	if (A == loc && pulling.density)
+	if(isliving(pulling))
+		var/mob/living/L = pulling
+		if(L.buckled && L.buckled.buckle_prevents_pull) //if they're buckled to something that disallows pulling, prevent it
+			stop_pulling()
+			return
+	if(A == loc && pulling.density)
 		return
-	if (!Process_Spacemove(get_dir(pulling.loc, A)))
+	if(!Process_Spacemove(get_dir(pulling.loc, A)))
 		return
 	step(pulling, get_dir(pulling.loc, A))

@@ -1,6 +1,6 @@
 var/global/static/ntnrc_uid = 0

-/datum/ntnet_conversation/
+/datum/ntnet_conversation
 	var/id = null
 	var/title = "Untitled Conversation"
 	var/datum/computer_file/program/chatclient/operator // "Administrator" of this channel. Creator starts as channel's operator,
@@ -2,7 +2,7 @@ var/global/datum/ntnet/ntnet_global = new()


 // This is the NTNet datum. There can be only one NTNet datum in game at once. Modular computers read data from this.
-/datum/ntnet/
+/datum/ntnet
 	var/list/relays = list()
 	var/list/logs = list()
 	var/list/available_station_software = list()
@@ -1,6 +1,6 @@
 var/global/file_uid = 0

-/datum/computer_file/
+/datum/computer_file
 	var/filename = "NewFile" 								// Placeholder. No spacebars
 	var/filetype = "XXX" 									// File full names are [filename].[filetype] so like NewFile.XXX in this case
 	var/size = 1											// File size in GQ. Integers only!
@@ -94,7 +94,7 @@
 	target = nTarget
 	update_text()

-/obj/item/weapon/paper/contract/infernal/
+/obj/item/weapon/paper/contract/infernal

 /obj/item/weapon/paper/contract/infernal/suicide_act(mob/user)
 	if(signed && (user == target.current) && istype(user,/mob/living/carbon/human/))
@@ -332,8 +332,9 @@ display round(lastgen) and plasmatank amount
 	power_gen = 15000
 	time_per_sheet = 85
 	board_path = /obj/item/weapon/circuitboard/machine/pacman/super
-	overheat()
-		explosion(src.loc, 3, 3, 3, -1)
+
+/obj/machinery/power/port_gen/pacman/super/overheat()
+	explosion(src.loc, 3, 3, 3, -1)

 /obj/machinery/power/port_gen/pacman/mrs
 	name = "\improper M.R.S.P.A.C.M.A.N.-type portable generator"
@@ -342,5 +343,6 @@ display round(lastgen) and plasmatank amount
 	power_gen = 40000
 	time_per_sheet = 80
 	board_path = /obj/item/weapon/circuitboard/machine/pacman/mrs
-	overheat()
-		explosion(src.loc, 4, 4, 4, -1)
+
+/obj/machinery/power/port_gen/pacman/mrs/overheat()
+	explosion(src.loc, 4, 4, 4, -1)
@@ -1,5 +1,5 @@
 /////SINGULARITY SPAWNER
-/obj/machinery/the_singularitygen/
+/obj/machinery/the_singularitygen
 	name = "Gravitational Singularity Generator"
 	desc = "An Odd Device which produces a Gravitational Singularity when set up."
 	icon = 'icons/obj/singularity.dmi'
@@ -208,7 +208,7 @@
 	variance = 25


-/obj/item/ammo_casing/shotgun/improvised/overload/
+/obj/item/ammo_casing/shotgun/improvised/overload
 	name = "overloaded improvised shell"
 	desc = "An extremely weak shotgun shell with multiple small pellets made out of metal shards. This one has been packed with even more \
 	propellant. It's like playing russian roulette, with a shotgun."
@@ -32,10 +32,6 @@
 		update_icon()
 		chamber_round(0)

-	if(unique_rename)
-		if(istype(A, /obj/item/weapon/pen))
-			rename_weapon(user)
-
 /obj/item/weapon/gun/ballistic/revolver/attack_self(mob/living/user)
 	var/num_unloaded = 0
 	chambered = null
@@ -1,4 +1,4 @@
-/obj/item/weapon/gun/magic/staff/
+/obj/item/weapon/gun/magic/staff
 	slot_flags = SLOT_BACK

 /obj/item/weapon/gun/magic/staff/change
@@ -1,4 +1,4 @@
-/obj/item/weapon/gun/magic/wand/
+/obj/item/weapon/gun/magic/wand
 	name = "wand of nothing"
 	desc = "It's not just a stick, it's a MAGIC stick!"
 	ammo_type = /obj/item/ammo_casing/magic
@@ -1,7 +1,7 @@
 /obj/item/projectile/bullet/reusable
 	name = "reusable bullet"
 	desc = "How do you even reuse a bullet?"
-	var/ammo_type = /obj/item/ammo_casing/caseless/
+	var/ammo_type = /obj/item/ammo_casing/caseless
 	var/dropped = 0
 	impact_effect_type = null

@@ -135,7 +135,7 @@
 		PoolOrNew(/obj/effect/hotspot, turf)
 	holder.chem_temp = 1000 // hot as shit

-/datum/chemical_reaction/reagent_explosion/methsplosion/
+/datum/chemical_reaction/reagent_explosion/methsplosion
 	name = "Meth explosion"
 	id = "methboom1"
 	results = list("methboom1" = 1)
@@ -1,4 +1,4 @@
-/obj/effect/proc_holder/spell/targeted/touch/
+/obj/effect/proc_holder/spell/targeted/touch
 	var/hand_path = "/obj/item/weapon/melee/touch_attack"
 	var/obj/item/weapon/melee/touch_attack/attached_hand = null
 	invocation_type = "none" //you scream on connecting, not summoning
@@ -245,12 +245,12 @@
 		if((!O.use_digitigrade && swap_back == FALSE) || (O.use_digitigrade && swap_back == TRUE))
 			if(O.body_part == LEG_LEFT)
 				if(swap_back == TRUE)
-					N = new /obj/item/bodypart/l_leg/
+					N = new /obj/item/bodypart/l_leg
 				else
 					N = new /obj/item/bodypart/l_leg/digitigrade
 			else if(O.body_part == LEG_RIGHT)
 				if(swap_back == TRUE)
-					N = new /obj/item/bodypart/r_leg/
+					N = new /obj/item/bodypart/r_leg
 				else
 					N = new /obj/item/bodypart/r_leg/digitigrade
 		if(!N)