Merge branch 'incremental_tg' r5067 into bs12_with_tgport

removed extraneous admin attack messages, temporarily disabled much moderator stuff (will be re-enabled in future updates) Conflicts: baystation12.dme code/__HELPERS/type2type.dm code/controllers/configuration.dm code/datums/datumvars.dm code/datums/helper_datums/getrev.dm code/defines/obj.dm code/game/gamemodes/events/black_hole.dm code/game/gamemodes/events/space_ninja.dm code/game/gamemodes/wizard/rightandwrong.dm code/game/jobs/job/captain.dm code/game/jobs/job/job.dm code/game/jobs/job_controller.dm code/game/machinery/bots/medbot.dm code/game/machinery/computer/card.dm code/game/machinery/telecomms/traffic_control.dm code/game/machinery/turrets.dm code/game/machinery/wishgranter.dm code/game/objects/items/blueprints.dm code/game/objects/items/devices/uplinks.dm code/game/objects/items/stacks/stack.dm code/game/objects/items/weapons/surgery_tools.dm code/game/turfs/turf.dm code/game/verbs/ooc.dm code/global.dm code/modules/admin/IsBanned.dm code/modules/admin/admin.dm code/modules/admin/admin_memo.dm code/modules/admin/admin_verbs.dm code/modules/admin/holder2.dm code/modules/admin/player_panel.dm code/modules/admin/verbs/adminpm.dm code/modules/admin/verbs/diagnostics.dm code/modules/assembly/igniter.dm code/modules/client/client defines.dm code/modules/client/client procs.dm code/modules/clothing/spacesuits/miscellaneous.dm code/modules/clothing/suits/armor.dm code/modules/clothing/suits/jobs.dm code/modules/mining/mine_turfs.dm code/modules/mob/living/carbon/human/say.dm code/modules/mob/living/carbon/human/update_icons.dm code/modules/mob/living/living.dm code/modules/mob/living/living_defense.dm code/modules/mob/living/silicon/robot/emote.dm code/modules/mob/living/silicon/robot/life.dm code/modules/mob/mob_cleanup.dm code/modules/mob/new_player/new_player.dm code/modules/mob/new_player/preferences.dm code/modules/paperwork/paper.dm code/modules/paperwork/photocopier.dm code/modules/projectiles/guns/projectile/automatic.dm code/modules/reagents/Chemistry-Machinery.dm code/setup.dm code/stylesheet.dm code/world.dm config/admins.txt config/config.txt html/changelog.html icons/mob/items_lefthand.dmi icons/mob/items_righthand.dmi icons/mob/suit.dmi icons/obj/clothing/suits.dmi icons/turf/areas.dmi Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2025-12-10 10:12:45 +00:00 · 2012-12-28 13:12:41 +10:00
parent 29ff212265 15e001d19d
commit 31349fb7d3
341 changed files with 17940 additions and 16947 deletions
--- a/code/modules/assembly/assembly.dm
+++ b/code/modules/assembly/assembly.dm
@@ -46,7 +46,7 @@
 	proc/holder_movement()							//Called when the holder is moved
 		return

-	proc/interact(mob/user as mob)					//Called when attack_self is called
+	interact(mob/user as mob)					//Called when attack_self is called
 		return


--- a/code/modules/assembly/bomb.dm
+++ b/code/modules/assembly/bomb.dm
@@ -75,29 +75,29 @@

 // ---------- Procs below are for tanks that are used exclusively in 1-tank bombs ----------

-/obj/item/weapon/tank/attackby(obj/item/weapon/W as obj, mob/user as mob)	//Bomb assembly proc. This turns assembly+tank into a bomb
-	if(istype(W, /obj/item/device/assembly_holder))
-		var/obj/item/device/assembly_holder/S = W
-		if(!S.secured)										//Check if the assembly is secured
-			return
-		if(isigniter(S.a_left) == isigniter(S.a_right))		//Check if either part of the assembly has an igniter, but if both parts are igniters, then fuck it
-			return
-
-		var/obj/item/device/onetankbomb/R = new /obj/item/device/onetankbomb(loc)
-
-		user.drop_item()			//Remove the assembly from your hands
-		user.remove_from_mob(src)	//Remove the tank from your character,in case you were holding it
-		user.put_in_hands(R)		//Equips the bomb if possible, or puts it on the floor.
-
-		R.bombassembly = S	//Tell the bomb about its assembly part
-		S.master = R		//Tell the assembly about its new owner
-		S.loc = R			//Move the assembly out of the fucking way
-
-		R.bombtank = src	//Same for tank
-		master = R
-		loc = R
-		R.update_icon()
+/obj/item/weapon/tank/proc/bomb_assemble(W,user)	//Bomb assembly proc. This turns assembly+tank into a bomb
+	var/obj/item/device/assembly_holder/S = W
+	var/mob/M = user
+	if(!S.secured)										//Check if the assembly is secured
 		return
+	if(isigniter(S.a_left) == isigniter(S.a_right))		//Check if either part of the assembly has an igniter, but if both parts are igniters, then fuck it
+		return
+
+	var/obj/item/device/onetankbomb/R = new /obj/item/device/onetankbomb(loc)
+
+	M.drop_item()			//Remove the assembly from your hands
+	M.remove_from_mob(src)	//Remove the tank from your character,in case you were holding it
+	M.put_in_hands(R)		//Equips the bomb if possible, or puts it on the floor.
+
+	R.bombassembly = S	//Tell the bomb about its assembly part
+	S.master = R		//Tell the assembly about its new owner
+	S.loc = R			//Move the assembly out of the fucking way
+
+	R.bombtank = src	//Same for tank
+	master = R
+	loc = R
+	R.update_icon()
+	return

 /obj/item/weapon/tank/proc/ignite()	//This happens when a bomb is told to explode
 	var/fuel_moles = air_contents.toxins + air_contents.oxygen/6
--- a/code/modules/assembly/holder.dm
+++ b/code/modules/assembly/holder.dm
@@ -66,11 +66,11 @@
 	update_icon()
 		overlays = null
 		if(a_left)
-			overlays += "[initial(a_left.icon_state)]_left"	//the initial() is probably unnecessary, but you just know
-			for(var/O in a_left.attached_overlays)		//someone is gonna fuck around with the icon_state in the future
+			overlays += "[a_left.icon_state]_left"
+			for(var/O in a_left.attached_overlays)
 				overlays += "[O]_l"
 		if(a_right)
-			src.overlays += "[initial(a_right.icon_state)]_right"
+			src.overlays += "[a_right.icon_state]_right"
 			for(var/O in a_right.attached_overlays)
 				overlays += "[O]_r"
 		if(master)
@@ -102,7 +102,26 @@
 			a_right.HasProximity(AM)
 		if(special_assembly)
 			special_assembly.HasProximity(AM)
-		return
+
+
+	HasEntered(atom/movable/AM as mob|obj)
+		if(a_left)
+			a_left.HasEntered(AM)
+		if(a_right)
+			a_right.HasEntered(AM)
+		if(special_assembly)
+			special_assembly.HasEntered(AM)
+
+
+	on_found(mob/finder as mob)
+		if(a_left)
+			a_left.on_found(finder)
+		if(a_right)
+			a_right.on_found(finder)
+		if(special_assembly)
+			if(istype(special_assembly, /obj/item))
+				var/obj/item/S = special_assembly
+				S.on_found(finder)


 	Move()
--- a/code/modules/assembly/igniter.dm
+++ b/code/modules/assembly/igniter.dm
@@ -7,10 +7,8 @@
 	w_amt = 10
 	origin_tech = "magnets=1"

-	wires = WIRE_RECEIVE
-
 	secured = 1
-
+	wires = WIRE_RECEIVE

 	activate()
 		if(!..())	return 0//Cooldown check
--- a/code/modules/assembly/mousetrap.dm
+++ b/code/modules/assembly/mousetrap.dm
@@ -0,0 +1,115 @@
+/obj/item/device/assembly/mousetrap
+	name = "mousetrap"
+	desc = "A handy little spring-loaded trap for catching pesty rodents."
+	icon_state = "mousetrap"
+	m_amt = 100
+	w_amt = 10
+	origin_tech = "combat=1"
+	var/armed = 0
+
+
+	examine()
+		..()
+		if(armed)
+			usr << "It looks like it's armed."
+
+	update_icon()
+		if(armed)
+			icon_state = "mousetraparmed"
+		else
+			icon_state = "mousetrap"
+		if(holder)
+			holder.update_icon()
+
+	proc/triggered(mob/target as mob, var/type = "feet")
+		if(!armed)
+			return
+		var/datum/organ/external/affecting = null
+		if(ishuman(target))
+			var/mob/living/carbon/human/H = target
+			switch(type)
+				if("feet")
+					if(!H.shoes)
+						affecting = H.get_organ(pick("l_leg", "r_leg"))
+						H.Weaken(3)
+				if("l_hand", "r_hand")
+					if(!H.gloves)
+						affecting = H.get_organ(type)
+						H.Stun(3)
+			if(affecting)
+				if(affecting.take_damage(1, 0))
+					H.UpdateDamageIcon()
+				H.updatehealth()
+		else if(ismouse(target))
+			var/mob/living/simple_animal/mouse/M = target
+			visible_message("\red <b>SPLAT!</b>")
+			M.splat()
+		playsound(target.loc, 'sound/effects/snap.ogg', 50, 1)
+		armed = 0
+		update_icon()
+		pulse(0)
+
+
+	attack_self(mob/living/user as mob)
+		if(!armed)
+			user << "<span class='notice'>You arm [src].</span>"
+		else
+			if(((user.getBrainLoss() >= 60 || (CLUMSY in user.mutations)) && prob(50)))
+				var/which_hand = "l_hand"
+				if(!user.hand)
+					which_hand = "r_hand"
+				triggered(user, which_hand)
+				user.visible_message("<span class='warning'>[user] accidentally sets off [src], breaking their fingers.</span>", \
+									 "<span class='warning'>You accidentally trigger [src]!</span>")
+				return
+			user << "<span class='notice'>You disarm [src].</span>"
+		armed = !armed
+		update_icon()
+		playsound(user.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -3)
+
+
+	attack_hand(mob/living/user as mob)
+		if(armed)
+			if(((user.getBrainLoss() >= 60 || CLUMSY in user.mutations)) && prob(50))
+				var/which_hand = "l_hand"
+				if(!user.hand)
+					which_hand = "r_hand"
+				triggered(user, which_hand)
+				user.visible_message("<span class='warning'>[user] accidentally sets off [src], breaking their fingers.</span>", \
+									 "<span class='warning'>You accidentally trigger [src]!</span>")
+				return
+		..()
+
+
+	HasEntered(AM as mob|obj)
+		if(armed)
+			if(ishuman(AM))
+				var/mob/living/carbon/H = AM
+				if(H.m_intent == "run")
+					triggered(H)
+					H.visible_message("<span class='warning'>[H] accidentally steps on [src].</span>", \
+									  "<span class='warning'>You accidentally step on [src]</span>")
+			if(ismouse(AM))
+				triggered(AM)
+		..()
+
+
+	on_found(mob/finder as mob)
+		if(armed)
+			finder.visible_message("<span class='warning'>[finder] accidentally sets off [src], breaking their fingers.</span>", \
+								   "<span class='warning'>You accidentally trigger [src]!</span>")
+			triggered(finder, finder.hand ? "l_hand" : "r_hand")
+			return 1	//end the search!
+		return 0
+
+
+	hitby(A as mob|obj)
+		if(!armed)
+			return ..()
+		visible_message("<span class='warning'>[src] is triggered by [A].</span>")
+		triggered(null)
+
+
+/obj/item/device/assembly/mousetrap/armed
+	icon_state = "mousetraparmed"
+	armed = 1