Merge branch 'Bubberstation:master' into master

code/modules/deathmatch/deathmatch_lobby.dm

@@ -153,6 +153,13 @@
 	for(var/datum/deathmatch_modifier/modifier as anything in modifiers)
 		GLOB.deathmatch_game.modifiers[modifier].apply(new_player, src)
 
+	// BUBBER EDIT BEGIN - No more abductors talking to station!
+	if(isabductor(new_player))
+		var/obj/item/organ/internal/tongue/abductor/tongue = new_player.get_organ_slot(ORGAN_SLOT_TONGUE)
+		if(istype(tongue, /obj/item/organ/internal/tongue/abductor))
+			tongue.mothership = "deathmatch"
+	// BUBBER EDIT END
+
 	// register death handling.
 	register_player_signals(new_player)
 

code/modules/jobs/job_types/chaplain/chaplain_nullrod.dm

@@ -49,6 +49,10 @@
 									Harms you if you dismiss the scythe without first causing harm to a creature. \
 									The shard also causes you to become Morbid, shifting your interests towards the macabre."
 		rods[/obj/item/melee/skateboard/holyboard] = "A skateboard that grants you flight and anti-magic abilities while ridden. Fits in your bag."
+		//bubberstation edit - start
+		rods[/obj/item/dualsaber/chaplain] = "A huge energy blade, it possesses the unique ability to block projectiles, but the unwieldy nature of it \
+means that you'll be forced to move carefully while it's on. Fits in pockets, and can be worn on the belt when off."
+		//bubberstation edit - end
 		AddComponent(/datum/component/subtype_picker, rods, CALLBACK(src, PROC_REF(on_holy_weapon_picked)))
 
 /obj/item/nullrod/proc/on_holy_weapon_picked(obj/item/nullrod/holy_weapon_type)

html/changelogs/AutoChangeLog-pr-1862.yml

@@ -0,0 +1,4 @@
+author: "Krypandenej"
+delete-after: True
+changes:
+  - rscadd: "Added Leary's Delight cigs, a xeno action figure, and a pale zippo to loadout"

html/changelogs/AutoChangeLog-pr-1907.yml

@@ -0,0 +1,4 @@
+author: "KeRSedChaplain"
+delete-after: True
+changes:
+  - rscadd: "Ports the Divine Lightblade nullrod from citadel"

html/changelogs/AutoChangeLog-pr-1911.yml

@@ -0,0 +1,4 @@
+author: "Odairu"
+delete-after: True
+changes:
+  - rscadd: "antag names"

html/changelogs/AutoChangeLog-pr-1924.yml

@@ -0,0 +1,4 @@
+author: "BurgerBB"
+delete-after: True
+changes:
+  - bugfix: "Fixes Moonstation Lighting being too dark."

html/changelogs/AutoChangeLog-pr-1926.yml

@@ -0,0 +1,4 @@
+author: "Odairu"
+delete-after: True
+changes:
+  - bugfix: "fixed abductors in deathmatch talking to station abductors"

modular_zubbers/code/game/objects/items/holy_weapons.dm

@@ -35,3 +35,146 @@
 /obj/item/storage/box/holy/papal/PopulateContents()
 	new /obj/item/clothing/head/mitre(src)
 	new /obj/item/clothing/suit/chaplainsuit/armor/papal(src)
+
+///////////////////////////////
+//// HYPEREUTACTIC BLADE /////
+/////////////////////////////
+/obj/item/dualsaber/chaplain
+	// Original from Citadel by Sishen1542
+	icon = 'modular_zubbers/icons/obj/weapons/1x2.dmi'
+	icon_state = "hypereutactic"
+	worn_icon = 'modular_zubbers/icons/mob/clothing/belt.dmi'
+	inhand_icon_state = "hypereutactic"
+	lefthand_file = 'modular_zubbers/icons/mob/inhands/64x64_lefthand.dmi'
+	righthand_file = 'modular_zubbers/icons/mob/inhands/64x64_righthand.dmi'
+	inhand_x_dimension = 64
+	inhand_y_dimension = 64
+	name = "divine lightblade"
+	desc = "A giant blade of bright and holy light, said to cut down the wicked with ease."
+	obj_flags = UNIQUE_RENAME
+	slot_flags = ITEM_SLOT_BELT
+	item_flags = NO_BLOOD_ON_ITEM | SLOWS_WHILE_IN_HAND | IMMUTABLE_SLOW
+	force = 5
+	armour_penetration = 0
+	throwforce = 5
+	throw_speed = 3
+	throw_range = 5
+	attack_verb_continuous = list("attackes", "slashes", "stabs", "slices", "destroys", "rips", "devastates", "shreds")
+	attack_verb_simple = list("attack", "slash", "stab", "slice", "destroy", "rip", "devastate", "shred")
+	block_chance = 30
+	block_sound = 'modular_zubbers/sound/weapons/nebblock.ogg'
+	two_hand_force = 20
+	slowdown = 0
+	var/chaplain_spawnable = TRUE
+	var/menu_description = "A huge energy blade, it possesses the unique ability to block projectiles, but the unwieldy nature of it \
+means that you'll be forced to move carefully while it's on. Fits in pockets, and can be worn on the belt when off."
+	var/list/cultists_slain
+
+/obj/item/dualsaber/chaplain/Initialize(mapload) //HEAVENLY FATHER I CRAVE COMPONENTS
+	. = ..()
+	AddComponent(/datum/component/two_handed, \
+		force_unwielded = force, \
+		force_wielded = two_hand_force, \
+		wieldsound = 'modular_zubbers/sound/weapons/nebon.ogg', \
+		unwieldsound = 'modular_zubbers/sound/weapons/neboff.ogg', \
+		wield_callback = CALLBACK(src, PROC_REF(on_wield)), \
+		unwield_callback = CALLBACK(src, PROC_REF(on_unwield)), \
+	)
+	AddComponent(/datum/component/anti_magic, TRUE, TRUE, FALSE, null, null, FALSE,)
+	AddComponent(/datum/component/effect_remover, \
+		success_feedback = "You disrupt the magic of %THEEFFECT with %THEWEAPON.", \
+		success_forcesay = "BEGONE FOUL MAGIKS!!", \
+		tip_text = "Clear rune", \
+		on_clear_callback = CALLBACK(src, PROC_REF(on_cult_rune_removed)), \
+		effects_we_clear = list(/obj/effect/rune, /obj/effect/heretic_rune, /obj/effect/cosmic_rune), \
+	)
+	AddElement(/datum/element/bane, target_type = /mob/living/basic/revenant, damage_multiplier = 0, added_damage = 25, requires_combat_mode = FALSE)
+
+/obj/item/dualsaber/chaplain/proc/on_cult_rune_removed(obj/effect/target, mob/living/user)
+	if(!istype(target, /obj/effect/rune))
+		return
+
+/obj/item/dualsaber/chaplain/on_wield()
+	.=..()
+	slowdown = 1
+
+/obj/item/dualsaber/chaplain/on_unwield()
+	.=..()
+	slowdown = 0
+
+/obj/item/dualsaber/chaplain/attack(mob/living/target_mob, mob/living/user, params)
+	if(!user.mind?.holy_role)
+		return ..()
+	if(!IS_CULTIST(target_mob) || istype(target_mob, /mob/living/carbon/human/cult_ghost))
+		return ..()
+
+	var/old_stat = target_mob.stat
+	. = ..()
+	if(old_stat < target_mob.stat)
+		LAZYOR(cultists_slain, REF(target_mob))
+	return .
+
+/obj/item/dualsaber/chaplain/update_icon_state()
+	.=..()
+	icon_state = inhand_icon_state = "hypereutactic"
+	return
+
+/obj/item/dualsaber/chaplain/update_overlays()
+	. = ..()
+	var/mutable_appearance/blade_overlay = mutable_appearance(icon, "hypereutactic_blade")
+	var/mutable_appearance/gem_overlay = mutable_appearance(icon, "hypereutactic_gem")
+
+	if(light_color)
+		blade_overlay.color = light_color
+		gem_overlay.color = light_color
+
+	. += gem_overlay
+
+	if(HAS_TRAIT(src, TRAIT_WIELDED))
+		. += blade_overlay
+
+/obj/item/dualsaber/chaplain/click_alt(mob/user)
+	. = ..()
+	if(!user.can_perform_action(src, SILENT_ADJACENCY) || hacked)
+		return
+	if(user.incapacitated() || !istype(user))
+		to_chat(user, "<span class='warning'>You can't do that right now!</span>")
+		return
+	if(alert("Are you sure you want to recolor your blade?", "Confirm Repaint", "Yes", "No") == "Yes")
+		var/energy_color_input = input(usr,"","Choose Energy Color",light_color) as color|null
+		if(!energy_color_input || !user.can_perform_action(src, SILENT_ADJACENCY) || hacked)
+			return
+		set_light_color(energy_color_input)
+		update_icon()
+		update_overlays()
+	return TRUE
+
+/obj/item/dualsaber/chaplain/process()
+	. = ..()
+	if(HAS_TRAIT(src, TRAIT_WIELDED))
+		if(hacked)
+			set_light_color(light_color)
+		open_flame()
+	else
+		return PROCESS_KILL
+
+/obj/item/dualsaber/chaplain/worn_overlays(isinhands, icon_file, used_state, style_flags = NONE)
+	. = ..()
+	if(isinhands)
+		var/mutable_appearance/gem_inhand = mutable_appearance(icon_file, "hypereutactic_gem")
+		gem_inhand.color = light_color
+		. += gem_inhand
+		if(HAS_TRAIT(src, TRAIT_WIELDED))
+			var/mutable_appearance/blade_inhand = mutable_appearance(icon_file, "hypereutactic_blade")
+			blade_inhand.color = light_color
+			. += blade_inhand
+
+/obj/item/dualsaber/chaplain/examine(mob/user)
+	. = ..()
+	. += "<span class='notice'>Alt-click to recolor it.</span>"
+	if (!IS_CULTIST(user) || !GET_ATOM_BLOOD_DNA_LENGTH(src))
+		return
+
+	var/num_slain = LAZYLEN(cultists_slain)
+	. += span_cult_italic("It has the blood of [num_slain] fallen cultist[num_slain == 1 ? "" : "s"] on it. \
+		<b>Offering</b> it to Nar'sie will transform it into a [num_slain >= 3 ? "powerful" : "standard"] cult weapon.")

modular_zubbers/code/modules/loadout/categories/pocket.dm

@@ -70,6 +70,11 @@
 	name = "Pocket Watch"
 	item_path = /obj/item/clothing/accessory/pocketwatch
 
+
+/datum/loadout_item/pocket_items/cigarettesleary
+	name = "Mindbreaker Cigs"
+	item_path = /obj/item/storage/fancy/cigarettes/cigpack_mindbreaker
+
 /*
 *	FLAGS
 */

modular_zubbers/code/modules/loadout/categories/toys.dm

@@ -54,3 +54,7 @@
 /datum/loadout_item/toys/secoff
 	name = "GalFed Secoff Plush"
 	item_path = /obj/item/toy/plush/secoff
+
+/datum/loadout_item/toys/xenofig
+	name = "Xeno Action Figure"
+	item_path = /obj/item/toy/toy_xeno

modular_zubbers/code/modules/power/lighting/light_mapping_helpers.dm

@@ -0,0 +1,22 @@
+/obj/machinery/light/moonstation
+
+	brightness = 10
+	bulb_power = 0.6
+	bulb_colour = "#FFE3BA"
+
+	nightshift_brightness = 10
+	nightshift_light_power = 0.6
+	nightshift_light_color = "#E4C9FF"
+
+	bulb_low_power_brightness_mul = 0.25
+	bulb_low_power_colour = "#FF7272"
+	bulb_low_power_pow_mul = 0.75
+	bulb_low_power_pow_min = 0.6
+
+	fire_brightness = 9
+	fire_power = 0.6
+	fire_colour = "#FF803A"
+
+	nightshift_allowed = TRUE
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/light/moonstation, 0)

modular_zubbers/maps/offstation/dauntless/mob_spawns.dm

@@ -169,7 +169,7 @@
 		id_card.registered_name = syndicate.real_name
 		id_card.update_label()
 		id_card.update_icon()
-
+	syndicate.apply_pref_name(/datum/preference/name/syndicate, syndicate.client)
 	handlebank(syndicate)
 	return ..()
 

tgstation.dme

@@ -9036,6 +9036,7 @@
 #include "modular_zubbers\code\modules\pollution\code\perfumes.dm"
 #include "modular_zubbers\code\modules\pollution\code\pollutants_generic.dm"
 #include "modular_zubbers\code\modules\power\powerator.dm"
+#include "modular_zubbers\code\modules\power\lighting\light_mapping_helpers.dm"
 #include "modular_zubbers\code\modules\power\supermatter\supermatter_gas.dm"
 #include "modular_zubbers\code\modules\projectiles\ammunition\ballistic\smg.dm"
 #include "modular_zubbers\code\modules\projectiles\boxes_magazines\external\smg.dm"