Merge branch 'master' of https://github.com/tgstation/tgstation into multiplierspeed

2026-07-18 03:26:31 +01:00 · 2016-12-09 18:03:43 -05:00
parent a3be7a9226 be00a90611
commit 43ce2667f4
105 changed files with 868 additions and 249 deletions
@@ -3,20 +3,13 @@
 	for(var/A in typesof(/obj/item))
 		var/obj/item/O = new A( locate(1,1,1) )
 		if(!O) continue
-		var/icon/IL = new(O.lefthand_file)
-		var/list/Lstates = IL.IconStates()
 		var/icon/IR = new(O.righthand_file)
 		var/list/Rstates = IR.IconStates()
 		var/icon/J = new(O.icon)
 		var/list/istates = J.IconStates()
-		if(!Lstates.Find(O.icon_state) && !Lstates.Find(O.item_state))
-			if(O.icon_state)
-				text += "[O.type] WANTS IN LEFT HAND CALLED\n\"[O.icon_state]\".\n"
 		if(!Rstates.Find(O.icon_state) && !Rstates.Find(O.item_state))
 			if(O.icon_state)
 				text += "[O.type] WANTS IN RIGHT HAND CALLED\n\"[O.icon_state]\".\n"
-
-
 		if(O.icon_state)
 			if(!istates.Find(O.icon_state))
 				text += "[O.type] MISSING NORMAL ICON CALLED\n\"[O.icon_state]\" IN \"[O.icon]\"\n"
@@ -220,3 +220,62 @@

 /obj/item/device/assembly/flash/armimplant/proc/cooldown()
 	overheat = FALSE
+
+/obj/item/device/assembly/flash/shield
+	name = "strobe shield"
+	desc = "A shield with a built in, high intensity light capable of blinding and disorienting suspects. Takes regular handheld flashes as bulbs."
+	icon = 'icons/obj/weapons.dmi'
+	icon_state = "flashshield"
+	item_state = "flashshield"
+	slot_flags = SLOT_BACK
+	force = 10
+	throwforce = 5
+	throw_speed = 2
+	throw_range = 3
+	w_class = WEIGHT_CLASS_BULKY
+	materials = list(MAT_GLASS=7500, MAT_METAL=1000)
+	origin_tech = "materials=3;combat=4"
+	attack_verb = list("shoved", "bashed")
+	block_chance = 50
+	armor = list(melee = 50, bullet = 50, laser = 50, energy = 0, bomb = 30, bio = 0, rad = 0, fire = 80, acid = 70)
+
+/obj/item/device/assembly/flash/shield/flash_recharge(interval=10)
+	if(times_used >= 4)
+		burn_out()
+		return 0
+	return 1
+
+/obj/item/device/assembly/flash/shield/attackby(obj/item/weapon/W, mob/user)
+	if(istype(W, /obj/item/device/assembly/flash/handheld))
+		var/obj/item/device/assembly/flash/handheld/flash = W
+		if(flash.crit_fail)
+			user << "No sense replacing it with a broken bulb."
+			return
+		else
+			user << "You begin to replace the bulb."
+			if(do_after(user, 20, target = src))
+				if(flash.crit_fail || !flash || qdeleted(flash))
+					return
+				crit_fail = FALSE
+				times_used = 0
+				playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
+				update_icon()
+				flash.crit_fail = TRUE
+				flash.update_icon()
+				return
+	..()
+
+/obj/item/device/assembly/flash/shield/update_icon(flash = 0)
+	item_state = "flashshield"
+	item_state = "flashshield"
+
+	if(crit_fail)
+		icon_state = "riot"
+		item_state = "riot"
+	else if(flash)
+		item_state = "flashshield_flash"
+		item_state = "flashshield_flash"
+		addtimer(src, "update_icon", 5)
+
+	if(holder)
+		holder.update_icon()
@@ -1,4 +1,4 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
+

 /*
 	SwapMaps library by Lummox JR
@@ -1,4 +1,4 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:33
+

 var/list/preferences_datums = list()

@@ -11,7 +11,6 @@
 	var/visor_flags = 0			// flags that are added/removed when an item is adjusted up/down
 	var/visor_flags_inv = 0		// same as visor_flags, but for flags_inv
 	var/visor_flags_cover = 0	// same as above, but for flags_cover
-	lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/clothing_righthand.dmi'
 	var/alt_desc = null
 	var/toggle_message = null
@@ -39,6 +39,15 @@
 	time = 15
 	category = CAT_WEAPON

+/datum/crafting_recipe/strobeshield
+	name = "strobe shield"
+	result = /obj/item/device/assembly/flash/shield
+	reqs = list(/obj/item/wallframe/flasher = 1,
+				/obj/item/device/assembly/flash/handheld = 1,
+				/obj/item/weapon/shield/riot = 1)
+	time = 40
+	category = CAT_WEAPON
+
 /datum/crafting_recipe/molotov
 	name = "Molotov"
 	result = /obj/item/weapon/reagent_containers/food/drinks/bottle/molotov
@@ -0,0 +1,42 @@
+/datum/round_event_control/sentience
+	name = "Random Human-level Intelligence"
+	typepath = /datum/round_event/ghost_role/sentience
+	weight = 5
+
+/datum/round_event/ghost_role/sentience
+	minimum_required = 1
+	role_name = "random animal"
+
+/datum/round_event/ghost_role/sentience/spawn_role()
+	var/list/mob/dead/observer/candidates
+	candidates = get_candidates(ROLE_ALIEN, null, ROLE_ALIEN)
+
+	// find our chosen mob to breathe life into
+	// Mobs have to be simple animals, mindless and on station
+	var/list/potential = list()
+	for(var/mob/living/simple_animal/L in living_mob_list)
+		var/turf/T = get_turf(L)
+		if(T.z != ZLEVEL_STATION)
+			continue
+		if(!(L in player_list) && !L.mind)
+			potential += L
+
+	var/mob/living/simple_animal/SA = pick(potential)
+	var/mob/dead/observer/SG = pick(candidates)
+
+	if(!SA || !SG)
+		return FALSE
+
+	SA.key = SG.key
+	SA.languages_spoken |= HUMAN
+	SA.languages_understood |= HUMAN
+	SA.sentience_act()
+
+	SA.maxHealth = max(SA.maxHealth, 200)
+	SA.health = SA.maxHealth
+	SA.del_on_death = FALSE
+
+	SA << "<span class='userdanger'>Hello world!</span>"
+	SA << "<span class='warning'>Due to freak radiation and/or chemicals \
+		and/or lucky chance, you have gained human level intelligence \
+		and the ability to speak and understand human language!</span>"
@@ -1,4 +1,4 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
+

 //is this shit even used at all
 /proc/NewStutter(phrase,stunned)
@@ -181,10 +181,6 @@
 	examine_line = "<span class='info'>It has a lot of liquid contents inside.</span>"
 	origin_tech = list("biotech" = 5)

-/datum/plant_gene/trait/squash/on_slip(obj/item/weapon/reagent_containers/food/snacks/grown/G, mob/living/carbon/target)
-	G.squash(target)
-
-
 /datum/plant_gene/trait/slip
 	// Makes plant slippery, unless it has a grown-type trash. Then the trash gets slippery.
 	// Applies other trait effects (teleporting, etc) to the target by on_slip.
@@ -321,7 +317,7 @@
 	G.reagents.maximum_volume *= rate

 /datum/plant_gene/trait/repeated_harvest
-	name = "perennial growth"
+	name = "Perennial Growth"

 /datum/plant_gene/trait/repeated_harvest/can_add(obj/item/seeds/S)
 	if(!..())
@@ -331,7 +327,7 @@
 	return TRUE

 /datum/plant_gene/trait/battery
-	name = "capacitive cellular production"
+	name = "Capacitive Cell Production"

 /datum/plant_gene/trait/battery/on_attackby(obj/item/weapon/reagent_containers/food/snacks/grown/G, obj/item/I, mob/user)
 	if(istype(I, /obj/item/stack/cable_coil))
@@ -359,7 +355,7 @@


 /datum/plant_gene/trait/stinging
-	name = "hypodermic prickles"
+	name = "Hypodermic Prickles"

 /datum/plant_gene/trait/stinging/on_throw_impact(obj/item/weapon/reagent_containers/food/snacks/grown/G, atom/target)
 	if(isliving(target) && G.reagents && G.reagents.total_volume)
@@ -376,10 +372,10 @@
 	trait_id = "plant_type"

 /datum/plant_gene/trait/plant_type/weed_hardy
-	name = "Robust Species"
+	name = "Weed Adaptation"

 /datum/plant_gene/trait/plant_type/fungal_metabolism
 	name = "Fungal Vitality"

 /datum/plant_gene/trait/plant_type/alien_properties
-	name ="?????"
+	name ="?????"
@@ -1,4 +1,4 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
+

 /var/const/access_security = 1 // Security equipment
 /var/const/access_brig = 2 // Brig timers and permabrig
@@ -162,8 +162,13 @@
 		blood_data["trace_chem"] = list2params(temp_chem)
 		if(mind)
 			blood_data["mind"] = mind
+		else if(last_mind)
+			blood_data["mind"] = last_mind
 		if(ckey)
 			blood_data["ckey"] = ckey
+		else if(last_mind)
+			blood_data["ckey"] = ckey(last_mind.key)
+
 		if(!suiciding)
 			blood_data["cloneable"] = 1
 		blood_data["blood_type"] = copytext(dna.blood_type,1,0)
@@ -1,4 +1,4 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
+

 /obj/item/device/mmi
 	name = "Man-Machine Interface"
@@ -1,4 +1,4 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
+

 /mob/living/brain
 	languages_spoken = HUMAN
@@ -1,4 +1,4 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
+

 /mob/living/carbon/alien/humanoid/proc/adjust_body_temperature(current, loc_temp, boost)
 	var/temperature = current
@@ -1,4 +1,4 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
+

 /mob/living/carbon/alien/larva/Life()
 	set invisibility = 0
@@ -1,4 +1,4 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
+

 //TODO: Make these simple_animals

@@ -768,5 +768,5 @@
 	. = ..()
 	. += "---"
 	.["Make AI"] = "?_src_=vars;makeai=\ref[src]"
-	.["Modify bodypart"] = "<option value='?_src_=vars;editbodypart=\ref[src]'>Modify bodypart</option>"
+	.["Modify bodypart"] = "?_src_=vars;editbodypart=\ref[src]"
 	.["Modify organs"] = "?_src_=vars;editorgans=\ref[src]"
@@ -25,6 +25,7 @@
 	var/obj/item/ears = null //only used by humans.

 	var/datum/dna/dna = null//Carbon
+	var/datum/mind/last_mind = null //last mind to control this mob, for blood-based cloning

 	var/failed_last_breath = 0 //This is used to determine if the mob failed a breath. If they did fail a brath, they will attempt to breathe each tick, otherwise just once per 4 ticks.

@@ -1,4 +1,4 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
+

 //NOTE: Breathing happens once per FOUR TICKS, unless the last breath fails. In which case it happens once per ONE TICK! So oxyloss healing is done once per 4 ticks while oxyloss damage is applied once per tick!

@@ -1,4 +1,4 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
+

 /mob/living/carbon/monkey

@@ -75,11 +75,12 @@
 		if(!t_state)
 			t_state = I.icon_state

-		var/icon_file = I.lefthand_file
-		if(get_held_index_of_item(I) % 2 == 0)
-			icon_file = I.righthand_file
+		var/image/standing = I.build_worn_icon(state = t_state, default_layer = HANDS_LAYER, default_icon_file = I.righthand_file, isinhands = TRUE)
+
+		if(get_held_index_of_item(I) % 2 == 1)
+			var/reflect = matrix(-1, 0, 0, 0, 1, 0)
+			standing.transform = reflect

-		var/image/standing = I.build_worn_icon(state = t_state, default_layer = HANDS_LAYER, default_icon_file = icon_file, isinhands = TRUE)
 		hands += standing

 	overlays_standing[HANDS_LAYER] = hands
@@ -1,4 +1,4 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
+

 // Mulebot - carries crates around for Quartermaster
 // Navigates via floor navbeacons
@@ -1,5 +1,3 @@
-
-
 /mob/living/simple_animal/cockroach
 	name = "cockroach"
 	desc = "This station is just crawling with bugs."
@@ -16,11 +14,15 @@
 	response_help  = "pokes"
 	response_disarm = "shoos"
 	response_harm   = "splats"
+	speak_emote = list("chitters")
 	density = 0
 	ventcrawler = VENTCRAWLER_ALWAYS
 	gold_core_spawnable = 2
+	verb_say = "chitters"
+	verb_ask = "chitters inquisitively"
+	verb_exclaim = "chitters loudly"
+	verb_yell = "chitters loudly"
 	var/squish_chance = 50
-	loot = list(/obj/effect/decal/cleanable/deadcockroach)
 	del_on_death = 1

 /mob/living/simple_animal/cockroach/death(gibbed)
@@ -28,6 +30,10 @@
 		return
 	..()

+/mob/living/simple_animal/cockroach/proc/squish()
+	adjustBruteLoss(1) // kills a normal cockroach
+	new /obj/effect/decal/cleanable/deadcockroach(get_turf(src))
+
 /mob/living/simple_animal/cockroach/Crossed(var/atom/movable/AM)
 	if(ismob(AM))
 		if(isliving(AM))
@@ -35,14 +41,14 @@
 			if(A.mob_size > MOB_SIZE_SMALL)
 				if(prob(squish_chance))
 					A.visible_message("<span class='notice'>\The [A] squashed \the [name].</span>", "<span class='notice'>You squashed \the [name].</span>")
-					death()
+					squish()
 				else
 					visible_message("<span class='notice'>\The [name] avoids getting crushed.</span>")
 	else
 		if(isobj(AM))
 			if(istype(AM,/obj/structure))
 				visible_message("<span class='notice'>As \the [AM] moved over \the [name], it was crushed.</span>")
-				death()
+				squish()

 /mob/living/simple_animal/cockroach/ex_act() //Explosions are a terrible way to handle a cockroach.
 	return
@@ -51,10 +51,13 @@
 		if(!l_state)
 			l_state = l_hand.icon_state

-		var/image/l_hand_image = l_hand.build_worn_icon(state = l_state, default_layer = DRONE_HANDS_LAYER, default_icon_file = l_hand.lefthand_file, isinhands = TRUE)
+		var/image/l_hand_image = l_hand.build_worn_icon(state = l_state, default_layer = DRONE_HANDS_LAYER, default_icon_file = l_hand.righthand_file, isinhands = TRUE)
 		if(y_shift)
 			l_hand_image.pixel_y += y_shift

+		var/reflect = matrix(-1, 0, 0, 0, 1, 0)
+		l_hand_image.transform = reflect
+
 		hands_overlays += l_hand_image

 		if(client && hud_used && hud_used.hud_version != HUD_STYLE_NOHUD)
@@ -293,8 +293,10 @@ var/global/list/parasites = list() //all currently existing/living guardians
 		if(!l_state)
 			l_state = l_hand.icon_state

-		var/image/l_hand_image = l_hand.build_worn_icon(state = l_state, default_layer = GUARDIAN_HANDS_LAYER, default_icon_file = l_hand.lefthand_file, isinhands = TRUE)
+		var/image/l_hand_image = l_hand.build_worn_icon(state = l_state, default_layer = GUARDIAN_HANDS_LAYER, default_icon_file = l_hand.righthand_file, isinhands = TRUE)

+		var/reflect = matrix(-1, 0, 0, 0, 1, 0)
+		l_hand_image.transform = reflect
 		hands_overlays += l_hand_image

 		if(client && hud_used && hud_used.hud_version != HUD_STYLE_NOHUD)
@@ -171,7 +171,7 @@ Difficulty: Medium
 	var/range = 10
 	var/turf/previousturf = get_turf(src)
 	for(var/turf/J in getline(src,E))
-		if(!range || !previousturf.atmos_adjacent_turfs || !previousturf.atmos_adjacent_turfs[J])
+		if(!range || (J != previousturf && (!previousturf.atmos_adjacent_turfs || !previousturf.atmos_adjacent_turfs[J])))
 			break
 		range--
 		PoolOrNew(/obj/effect/hotspot,J)
@@ -129,6 +129,8 @@
 		return 0
 	if(isliving(mob))
 		var/mob/living/L = mob
+		if(L.slipping)
+			return 0
 		if(L.incorporeal_move)	//Move though walls
 			Process_Incorpmove(direct)
 			return 0
@@ -1,4 +1,4 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:33
+

 /mob/new_player
 	var/ready = 0
@@ -2,7 +2,7 @@
 	name = "paper cutter"
 	desc = "Standard office equipment. Precisely cuts paper using a large blade."
 	icon = 'icons/obj/bureaucracy.dmi'
-	icon_state = "papercutter-cutter"
+	icon_state = "papercutter"
 	force = 5
 	throwforce = 5
 	w_class = WEIGHT_CLASS_NORMAL
@@ -15,6 +15,7 @@
 /obj/item/weapon/papercutter/New()
 	..()
 	storedcutter = new /obj/item/weapon/hatchet/cutterblade(src)
+	update_icon()


 /obj/item/weapon/papercutter/suicide_act(mob/user)
@@ -1,4 +1,4 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:33
+

 /* new portable generator - work in progress

@@ -1,4 +1,4 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:33
+
 var/global/list/rad_collectors = list()

 /obj/machinery/power/rad_collector
@@ -1,4 +1,4 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:33
+

 /obj/machinery/field/containment
 	name = "containment field"
@@ -1,4 +1,4 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:33
+

 /obj/machinery/power/emitter
 	name = "Emitter"
@@ -1,4 +1,4 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:33
+


 /*
@@ -1,4 +1,4 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:33
+

 /obj/singularity
 	name = "gravitational singularity"
@@ -38,7 +38,6 @@
 	var/current_skin = null //the skin choice if we had a reskin
 	var/list/options = list()

-	lefthand_file = 'icons/mob/inhands/guns_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/guns_righthand.dmi'

 	var/obj/item/device/firing_pin/pin = /obj/item/device/firing_pin //standard firing pin for most guns
@@ -70,7 +70,6 @@
 	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "pen"
 	item_state = "pen"
-	lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/items_righthand.dmi'
 	w_class = WEIGHT_CLASS_TINY

@@ -19,7 +19,6 @@
 	trigger_guard = TRIGGER_GUARD_ALLOW_ALL // Has no trigger at all, uses magic instead
 	pin = /obj/item/device/firing_pin/magic

-	lefthand_file = 'icons/mob/inhands/items_lefthand.dmi' //not really a gun and some toys use these inhands
 	righthand_file = 'icons/mob/inhands/items_righthand.dmi'

 /obj/item/weapon/gun/magic/afterattack(atom/target, mob/living/user, flag)
@@ -225,7 +225,7 @@
 				pixel_x = pixel_x_offset
 				pixel_y = pixel_y_offset
 			else
-				animate(src, pixel_x = pixel_x_offset, pixel_y = pixel_y_offset, time = max(1, (delay <= 3 ? delay - 1 : delay)))
+				animate(src, pixel_x = pixel_x_offset, pixel_y = pixel_y_offset, time = max(1, (delay <= 3 ? delay - 1 : delay)), flags = ANIMATION_END_NOW)

 			if(original && (original.layer>=2.75) || ismob(original))
 				if(loc == get_turf(original))
@@ -1,4 +1,4 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
+

 var/const/TOUCH = 1 //splashing
 var/const/INGEST = 2 //ingestion
@@ -116,12 +116,17 @@
 // attack with item, place item on conveyor
 /obj/machinery/conveyor/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/weapon/crowbar))
-		if(!(stat & BROKEN))
-			var/obj/item/conveyor_construct/C = new/obj/item/conveyor_construct(src.loc)
-			C.id = id
-			transfer_fingerprints_to(C)
-		user << "<span class='notice'>You remove the conveyor belt.</span>"
-		qdel(src)
+		user.visible_message("<span class='notice'>[user] struggles to pry up \the [src] with \the [I].</span>", \
+		"<span class='notice'>You struggle to pry up \the [src] with \the [I].</span>")
+		if(do_after(user, 40*I.toolspeed, target = src))
+			if(qdeleted(src))
+				return //prevent multiple decontructs
+			if(!(stat & BROKEN))
+				var/obj/item/conveyor_construct/C = new/obj/item/conveyor_construct(src.loc)
+				C.id = id
+				transfer_fingerprints_to(C)
+			user << "<span class='notice'>You remove the conveyor belt.</span>"
+			qdel(src)

 	else if(istype(I, /obj/item/weapon/wrench))
 		if(!(stat & BROKEN))
@@ -1,4 +1,4 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:33
+

 /*
 Destructive Analyzer
@@ -1,4 +1,4 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:33
+

 //All devices that link into the R&D console fall into thise type for easy identification and some shared procs.

@@ -28,7 +28,3 @@

 /mob/living/carbon/getorganslot(slot)
 	return internal_organs_slot[slot]
-
-
-/proc/isorgan(atom/A)
-	return istype(A, /obj/item/organ)