Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull

code/game/objects/effects/alien/aliens.dm

@@ -66,7 +66,7 @@
 
 /obj/effect/alien/resin/attack_generic(var/mob/user, var/damage, var/attack_verb)
 	visible_message("<span class='danger'>[user] [attack_verb] the [src]!</span>")
-	playsound(loc, 'sound/effects/attackblob.ogg', 100, 1)
+	playsound(src, 'sound/effects/attackblob.ogg', 100, 1)
 	user.do_attack_animation(src)
 	health -= damage
 	healthcheck()
@@ -100,7 +100,7 @@
 		tforce = 10
 	else
 		tforce = AM:throwforce
-	playsound(loc, 'sound/effects/attackblob.ogg', 100, 1)
+	playsound(src, 'sound/effects/attackblob.ogg', 100, 1)
 	health = max(0, health - tforce)
 	healthcheck()
 	..()
@@ -137,7 +137,7 @@
 	user.setClickCooldown(user.get_attack_speed(W))
 	var/aforce = W.force
 	health = max(0, health - aforce)
-	playsound(loc, 'sound/effects/attackblob.ogg', 100, 1)
+	playsound(src, 'sound/effects/attackblob.ogg', 100, 1)
 	healthcheck()
 	..()
 	return
@@ -176,11 +176,11 @@
 	. = ..()
 	if(isspace(loc))
 		return INITIALIZE_HINT_QDEL
-	
+
 	linked_node = node
 	if(newcolor)
 		color = newcolor
-	
+
 	if(icon_state == "weeds")
 		icon_state = pick("weeds", "weeds1", "weeds2")
 
@@ -203,7 +203,7 @@
 	desc = "Weird glowing organic growth."
 	layer = ABOVE_TURF_LAYER+0.01
 	light_range = NODERANGE
-	
+
 	var/node_range = NODERANGE
 	var/set_color = "#321D37"
 
@@ -216,6 +216,8 @@
 		else
 			qdel(existing)
 
+	linked_node = src
+
 	if(newcolor)
 		set_color = newcolor
 	if(set_color)
@@ -299,7 +301,7 @@
 
 		W.color = W.linked_node.set_color
 
-		if(prob(max(10, 40 - (5 * nearby_weeds.len))))
+		if(prob(max(10, 60 - (5 * nearby_weeds.len))))
 			W.process()
 
 /obj/effect/alien/weeds/ex_act(severity)
@@ -328,7 +330,7 @@
 
 		if(WT.remove_fuel(0, user))
 			damage = 15
-			playsound(loc, 'sound/items/Welder.ogg', 100, 1)
+			playsound(src, 'sound/items/Welder.ogg', 100, 1)
 
 	health -= damage
 	healthcheck()
@@ -531,7 +533,7 @@
 
 		if(WT.remove_fuel(0, user))
 			damage = 15
-			playsound(src.loc, 'sound/items/Welder.ogg', 100, 1)
+			playsound(src, 'sound/items/Welder.ogg', 100, 1)
 
 	src.health -= damage
 	src.healthcheck()

code/game/objects/effects/decals/contraband.dm

@@ -146,7 +146,7 @@
 
 /obj/structure/sign/poster/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if(W.is_wirecutter())
-		playsound(src.loc, W.usesound, 100, 1)
+		playsound(src, W.usesound, 100, 1)
 		if(ruined)
 			to_chat(user, "<span class='notice'>You remove the remnants of the poster.</span>")
 			qdel(src)
@@ -166,7 +166,7 @@
 			return
 
 		visible_message("<span class='warning'>[user] rips [src] in a single, decisive motion!</span>" )
-		playsound(src.loc, 'sound/items/poster_ripped.ogg', 100, 1)
+		playsound(src, 'sound/items/poster_ripped.ogg', 100, 1)
 		ruined = 1
 		icon_state = "poster_ripped"
 		name = "ripped poster"

code/game/objects/effects/decals/posters/polarisposters_vr.dm

@@ -1,5 +1,5 @@
-/datum/poster/nanotrasen/nt_7
-	name = "SolCom"
-	desc = "This poster showcases an TCG emblem. The outer ring reads,\
+/datum/poster/nanotrasen/nt_7 //YW EDIT: SolGov, USDF
+	name = "SolGov"
+	desc = "This poster showcases an USDF emblem. The outer ring reads,\
 	\"<font face='times new roman ms'>NIL MORTALIBUS ARDUI EST</font>\".\
 	Commonwealth of Sol-Procyon."

code/game/objects/effects/decals/posters/voreposters_vr.dm

@@ -49,4 +49,48 @@
 /datum/poster/vore_13
 	icon_state = "sbsposter13"
 	name = "Ammer"
-	desc = "You see a blue panda on the poster. She's awfully smug about her size."
+	desc = "You see a blue panda on the poster. She's awfully smug about her size."
+/datum/poster/vore_14
+	icon_state = "dwposter1"
+	name = "WANTED: WAR CRIMINAL"
+	desc = "A poster bringing awareness to the distinguishing costume of a known war criminal operating in Virgo-Erigonne space."
+/datum/poster/vore_15
+	icon_state = "dwposter2"
+	name = "Implanter"
+	desc = "A poster explaining the benefits and function of back-up implanters."
+/datum/poster/vore_16
+	icon_state = "dwposter3"
+	name = "Back-up implant"
+	desc = "A poster describing the electronics implanted by back-up implanters."
+/datum/poster/vore_17
+	icon_state = "dwposter4"
+	name = "We know"
+	desc = "A poster purporting the infallibility of NanoTrasen's forensics department."
+/datum/poster/vore_18
+	icon_state = "dwposter5"
+	name = "KAT"
+	desc = "A promotional poster for popular exotube show 'Kat-Kat Korner'"
+/datum/poster/vore_19
+	icon_state = "dwposter6"
+	name = "install.css"
+	desc = "A nostalgia trip."
+/datum/poster/vore_20
+	icon_state = "dwposter7"
+	name = "TALON"
+	desc = "The logo and banner of a notable group of contractors known to trade with NanoTrasen."
+/datum/poster/vore_21
+	icon_state = "dwposter8"
+	name = "GPA"
+	desc = "A pretentious advertisement for the drink 'Galactic Panic Attack'"
+/datum/poster/vore_22
+	icon_state = "dwposter9"
+	name = "Rope"
+	desc = "A poster outlining proper pit-traversal gear."
+/datum/poster/vore_23
+	icon_state = "dwposter10"
+	name = "Visit Luna"
+	desc = "Part of a tourism campaign from SolCom encouraging people to visit Earth's moon, Luna."
+/datum/poster/vore_24
+	icon_state = "dwposter11"
+	name = "Secgun"
+	desc = "A striking, wordless advertisement for NanoTrasen's security department. It wasn't very effective and just seems to be used as a warning sign."

code/game/objects/effects/effect_system.dm

@@ -98,7 +98,7 @@ steam.start() -- spawns the effect
 
 /obj/effect/effect/sparks/New()
 	..()
-	playsound(src.loc, "sparks", 100, 1)
+	playsound(src, "sparks", 100, 1)
 	var/turf/T = src.loc
 	if (istype(T, /turf))
 		T.hotspot_expose(1000,100)

code/game/objects/effects/mines.dm

@@ -61,7 +61,7 @@
 		panel_open = !panel_open
 		user.visible_message("<span class='warning'>[user] very carefully screws the mine's panel [panel_open ? "open" : "closed"].</span>",
 		"<span class='notice'>You very carefully screw the mine's panel [panel_open ? "open" : "closed"].</span>")
-		playsound(src.loc, W.usesound, 50, 1)
+		playsound(src, W.usesound, 50, 1)
 
 	else if((W.is_wirecutter() || istype(W, /obj/item/device/multitool)) && panel_open)
 		interact(user)
@@ -224,7 +224,7 @@
 	msg_admin_attack("[key_name_admin(user)] primed \a [src]")
 	user.visible_message("[user] starts priming \the [src.name].", "You start priming \the [src.name]. Hold still!")
 	if(do_after(user, 10 SECONDS))
-		playsound(loc, 'sound/weapons/armbomb.ogg', 75, 1, -3)
+		playsound(src, 'sound/weapons/armbomb.ogg', 75, 1, -3)
 		prime(user)
 	else
 		visible_message("[user] triggers \the [src.name]!", "You accidentally trigger \the [src.name]!")