Merge branch 'master' into Fix-USCM-Synth-Point-Double

code/modules/cm_marines/smartgun_mount.dm

@@ -906,7 +906,7 @@
 	user.visible_message(SPAN_NOTICE("[user] lets go of \the [src]."),SPAN_NOTICE("You let go of \the [src], letting the gun rest."))
 	user.unfreeze()
 	user.reset_view(null)
-	user.forceMove(get_step(src, reverse_direction(src.dir)))
+	user.Move(get_step(src, reverse_direction(src.dir)))
 	user.setDir(dir) //set the direction of the player to the direction the gun is facing
 	user_old_x = 0 //reset our x
 	user_old_y = 0 //reset our y

code/modules/mob/living/carbon/xenomorph/Facehuggers.dm

@@ -246,7 +246,7 @@
 	throw_atom(target, 3, SPEED_FAST)
 	return TRUE
 
-/obj/item/clothing/mask/facehugger/proc/attach(mob/living/living_mob, silent = FALSE, knockout_mod = 1, hugger_ckey = null)
+/obj/item/clothing/mask/facehugger/proc/attach(mob/living/living_mob, silent = FALSE, knockout_mod = 1, mob/living/carbon/xenomorph/facehugger/hugger)
 	if(attached || !can_hug(living_mob, hivenumber))
 		return FALSE
 
@@ -281,7 +281,22 @@
 		if(!human.species || !(human.species.flags & IS_SYNTHETIC)) //synthetics aren't paralyzed
 			human.apply_effect(MIN_IMPREGNATION_TIME * 0.5 * knockout_mod, PARALYZE) //THIS MIGHT NEED TWEAKS
 
-	addtimer(CALLBACK(src, PROC_REF(impregnate), human, hugger_ckey), rand(MIN_IMPREGNATION_TIME, MAX_IMPREGNATION_TIME))
+	var/area/hug_area = get_area(src)
+	var/name = hugger ? "[hugger]" : "\a [src]"
+	if(hug_area)
+		for(var/mob/dead/observer/observer as anything in GLOB.observer_list)
+			to_chat(observer, SPAN_DEADSAY("<b>[human]</b> has been facehugged by <b>[name]</b> at \the <b>[hug_area]</b> [OBSERVER_JMP(observer, human)]"))
+		to_chat(src, SPAN_DEADSAY("<b>[human]</b> has been facehugged by <b>[name]</b> at \the <b>[hug_area]</b>"))
+	else
+		for(var/mob/dead/observer/observer as anything in GLOB.observer_list)
+			to_chat(observer, SPAN_DEADSAY("<b>[human]</b> has been facehugged by <b>[name]</b> [OBSERVER_JMP(observer, human)]"))
+		to_chat(src, SPAN_DEADSAY("<b>[human]</b> has been facehugged by <b>[name]</b>"))
+	if(hug_area)
+		xeno_message(SPAN_XENOMINORWARNING("You sense that [name] has facehugged a host at \the [hug_area]!"), 1, hivenumber)
+	else
+		xeno_message(SPAN_XENOMINORWARNING("You sense that [name] has facehugged a host!"), 1, hivenumber)
+
+	addtimer(CALLBACK(src, PROC_REF(impregnate), human, hugger?.client?.ckey), rand(MIN_IMPREGNATION_TIME, MAX_IMPREGNATION_TIME))
 
 	return TRUE
 

code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm

@@ -149,23 +149,10 @@
 
 /mob/living/carbon/xenomorph/facehugger/proc/handle_hug(mob/living/carbon/human/human)
 	var/obj/item/clothing/mask/facehugger/hugger = new /obj/item/clothing/mask/facehugger(loc, hivenumber)
-	var/did_hug = hugger.attach(human, TRUE, 0.5, client?.ckey)
+	var/did_hug = hugger.attach(human, TRUE, 0.5, src)
 	if(client)
 		client.player_data?.adjust_stat(PLAYER_STAT_FACEHUGS, STAT_CATEGORY_XENO, 1)
-	var/area/hug_area = get_area(src)
-	if(hug_area)
-		for(var/mob/dead/observer/observer as anything in GLOB.observer_list)
-			to_chat(observer, SPAN_DEADSAY("<b>[human]</b> has been facehugged by <b>[src]</b> at \the <b>[hug_area]</b>" + " [OBSERVER_JMP(observer, human)]"))
-		to_chat(src, SPAN_DEADSAY("<b>[human]</b> has been facehugged by <b>[src]</b> at \the <b>[hug_area]</b>"))
-	else
-		for(var/mob/dead/observer/observer as anything in GLOB.observer_list)
-			to_chat(observer, SPAN_DEADSAY("<b>[human]</b> has been facehugged by <b>[src]</b>" + " [OBSERVER_JMP(observer, human)]"))
-		to_chat(src, SPAN_DEADSAY("<b>[human]</b> has been facehugged by <b>[src]</b>"))
 	qdel(src)
-	if(hug_area)
-		xeno_message(SPAN_XENOMINORWARNING("You sense that [src] has facehugged a host at \the [hug_area]!"), 1, src.hivenumber)
-	else
-		xeno_message(SPAN_XENOMINORWARNING("You sense that [src] has facehugged a host!"), 1, src.hivenumber)
 	return did_hug
 
 /mob/living/carbon/xenomorph/facehugger/age_xeno()

html/changelogs/archive/2023-07.yml

@@ -246,3 +246,84 @@
   - bugfix: Fixes another synth survivor variant having marine comms.
   theselfish:
   - spellcheck: Goodbye Squad Spotter, hello regular non-squaded Spotter.
+2023-07-20:
+  Anuv:
+  - bugfix: '#3775'
+  - rscadd: Added a new storm siren unique to NV, new survivor types
+  - spellcheck: Updates to the waking distress call notif.
+  - code_imp: Weather-related code changes. Update to the handheld maps.
+  - soundadd: Added new monsoon weather sfx, new map-unique ambience, new storm siren
+      sfx.
+  - maptweak: New LZ (LZ2 Palm Airfield) in the NE with a construction zone. Removed
+      a number of rocks around cave areas. Increased hive location choices from 3
+      to 4. Added glass ceilings to facility areas (deep caves are still protected,
+      can be OB'd). Slightly widened the 45 minute weed protection areas around LZs.
+      Added a fog monsoon to the SE beach that dissipates after an hour. Expanded
+      east beach. New SW cave section. Opened up the walkway west of LZ1. Enhanced
+      survivor loot and mats to a comparable degree to current maps. Many small changes
+      to lessen chokes and offer more route choice for xenos and marines alike. Removed
+      Spearhead/Rival and laser pistols. Swapped fawras for monkeys. Added more survivor-type
+      choices. Added a bar area and decrepit truck to the north beach.
+  - config: Enabled NV again as a map in maps.txt.
+  Awantje:
+  - bugfix: The M56D no longer let's you violate density code when exiting it.
+  BeagleGaming1:
+  - config: Moved time to burst to the config
+  - balance: Fixed time to burst, lowering it from 15 minutes to 7.5 minutes by default
+  - balance: Stasis bags used on late-stage mobs properly slow growth down less
+  Ben10083:
+  - qol: Non player Facehuggers now also notify the hive when they facehug something.
+  - spellcheck: fix typo relating to Starshell ash
+  Diegoflores31:
+  - balance: Acid Splash damage increased to 25
+  - balance: Acid Splash damage can be reduced with BIO armor.
+  - balance: Reduced Light armor BIO resistance by 10
+  - balance: Increased Heavy armor BIO resistance by 5
+  - balance: Increased VL vest BIO resistance by 5
+  GoldenDarkness55:
+  - balance: Base rav cooldown regain per slash reduced (4 to 3), empowered charge
+      stun duration reduced (2 to 1.3), empower duration increased (5 to 6.5), empower
+      cooldown reduced (22 to 18), duration window for second empower cast reduced
+      (15 to 6), base shield gain reduced (75 to 50), shield gain per marine reduced
+      (80 to 50), maximum empower targets increased (5 to 6), scissor slash cooldown
+      reduced (10 to 6), and damage reduced (45 to 40)
+  - balance: Hedge rav doesn't lose speed anymore, but loses 10 slash damage instead.
+      Shield duration increased (2 to 2.5), Fire Spikes shard range increased (5 to
+      6), Spike Shed shard lockout duration reduced (30 to 15), shard lock speed reduced
+      to maintain same speed as previously. Shard damage increased (5 to 8), shard
+      slowdown duration reduced (8 to 3), shard gain per tick reduced (10 to 5), shard
+      gain per bullet reduced (20 to 10), added shard gain per slash (15)
+  Huffie56:
+  - bugfix: fix some area having no apc on the almayer making them not behave like
+      they should specialy when hijack happen.
+  IowaPotatoFarmer:
+  - rscadd: The PMC Crash on Solaris Ridge now spawns one PMC medic survivor and one
+      PMC engineer survivor.
+  - bugfix: The Wey-Yu goon survivors now have their unique corporate white camo M41A
+      MK2 back.
+  Kaboomcat:
+  - imageadd: Updated the gin bottle sprite
+  QuickLoad:
+  - balance: Tones down ERT skills. Impacts VAIPO/Dutch'sDozen/CMB/UPP/CLF/EMerc.
+  - balance: Gives PMC & SurvPMC a trained level of CQC.
+  Steelpoint:
+  - maptweak: More weed spawns so larva don't spawn in area with no weed to evolve
+      on.
+  - rscadd: Predator toolbelt is now a unique item with its own sprite.
+  TeDGamer:
+  - bugfix: Xenos allied to the hive can now open hive's doors
+  - bugfix: Huggers can now scuttle doors
+  - code_imp: Combined hugger + larva code to allow for any small castes to scuttle
+  Zonespace27:
+  - balance: Trashbags now hold normal items and can be looked through like a box
+      or storage container.
+  - balance: Trashbags no longer fit in your belt slot.
+  ihatethisengine:
+  - balance: Lurkers don't lose invisibility when they bump into partly visible mobs.
+  realforest2001:
+  - admin: Removed the R_REJUVINATE permissions flag and replaces instances where
+      it is used with R_MOD.
+  - admin: Added logs if a restricted proc is proccalled.
+  silencer_pl:
+  - qol: Default paper and desc_lore viewing windows are now larger to match the expected
+      content in them better.