Merge pull request #77 from Citadel-Station-13/master

4/12

code/datums/diseases/advance/symptoms/heal.dm

@@ -384,7 +384,7 @@
 	var/temp_rate = 1
 	threshold_desc = list(
 		"Transmission 6" = "Additionally increases temperature adjustment rate and heals those who love toxins",
-		"Resistance 7" = "Increases healing speed.",
+		"Stage Speed 7" = "Increases healing speed.",
 	)
 /datum/symptom/heal/plasma/Start(datum/disease/advance/A)
 	if(!..())

code/datums/elements/mob_holder.dm

@@ -141,7 +141,7 @@
 
 /obj/item/clothing/head/mob_holder/dropped(mob/user)
 	. = ..()
-	if(held_mob && !ismob(loc))//don't release on soft-drops
+	if(held_mob && !ismob(loc) && !istype(loc,/obj/item/storage))//don't release on soft-drops
 		release()
 
 /obj/item/clothing/head/mob_holder/proc/release()

code/modules/mob/living/simple_animal/friendly/drone/inventory.dm

@@ -6,7 +6,7 @@
 //Drone hands
 
 
-/mob/living/simple_animal/drone/doUnEquip(obj/item/I, force, silent = FALSE)
+/mob/living/simple_animal/drone/doUnEquip(obj/item/I, force, newloc, no_move, invdrop = TRUE, silent = FALSE)
 	if(..())
 		update_inv_hands()
 		if(I == head)

code/modules/mob/living/simple_animal/hostile/alien.dm

@@ -24,6 +24,7 @@
 	melee_damage_upper = 25
 	attack_verb_continuous = "slashes"
 	attack_verb_simple = "slash"
+	gold_core_spawnable = HOSTILE_SPAWN
 	speak_emote = list("hisses")
 	bubble_icon = "alien"
 	a_intent = INTENT_HARM
@@ -36,7 +37,6 @@
 	see_in_dark = 8
 	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
 	unique_name = 1
-	gold_core_spawnable = NO_SPAWN
 	death_sound = 'sound/voice/hiss6.ogg'
 	deathmessage = "lets out a waning guttural screech, green blood bubbling from its maw..."
 
@@ -106,6 +106,7 @@
 							/obj/item/stack/sheet/animalhide/xeno = 1)
 	projectiletype = /obj/item/projectile/neurotox
 	projectilesound = 'sound/weapons/pierce.ogg'
+	gold_core_spawnable = NO_SPAWN
 	status_flags = 0
 	unique_name = 0
 	var/sterile = 1

config/config.txt

@@ -382,7 +382,7 @@ NOTIFY_NEW_PLAYER_ACCOUNT_AGE 1
 #PANIC_SERVER_NAME [Put the name here]
 
 ##Automated age verification, comment this out to not ask new users if they are 18+
-AGE_VERIFICATION
+#AGE_VERIFICATION
 
 ## Uncomment to have the changelog file automatically open when a user connects and hasn't seen the latest changelog
 #AGGRESSIVE_CHANGELOG

html/changelog.html

@@ -50,6 +50,28 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">13 April 2021</h2>
+			<h3 class="author">rossark updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">wrong word</li>
+			</ul>
+
+			<h2 class="date">12 April 2021</h2>
+			<h3 class="author">BlueWildrose updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixed female slime-subspecies left/right sprites being flipped</li>
+				<li class="bugfix">Fixed drones nullspacing things they try to place on tables and in closets</li>
+				<li class="bugfix">Fixed phantom mob-holder items. You can now grab Ian from your backpack without any issues.</li>
+			</ul>
+			<h3 class="author">silicons updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="balance">gold cores can spawn simplemob xenos again.</li>
+			</ul>
+			<h3 class="author">timothyteakettle updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="config">makes AGE_VERIFICATION option off by default</li>
+			</ul>
+
 			<h2 class="date">09 April 2021</h2>
 			<h3 class="author">BlueWildrose updated:</h3>
 			<ul class="changes bgimages16">
@@ -871,56 +893,6 @@
 			<ul class="changes bgimages16">
 				<li class="tweak">the aesthetic sterile mask no longer hides faces so you can cosplay egirls and keep flavortexts</li>
 			</ul>
-
-			<h2 class="date">09 February 2021</h2>
-			<h3 class="author">Chiirno updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Adds clown waddle to clown shoes. Enhanced Clown Waddle Dampeners can be engaged in-hand with ctrl+click, _but why would you?_</li>
-			</ul>
-			<h3 class="author">MrJWhit updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Re-adds theater disposal outlet, and makes dorms disposal able to have things sent to it on boxstation.</li>
-			</ul>
-			<h3 class="author">TyrianTyrell updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">made default tongue able to speak signed language.</li>
-			</ul>
-			<h3 class="author">timothyteakettle updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="balance">sentient viruses can now infect synths and ipcs</li>
-			</ul>
-
-			<h2 class="date">07 February 2021</h2>
-			<h3 class="author">Thalpy updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="refactor">Dispenser: Adds the ability to store a small amount of reagents in the machine itself for dispensing. Reacting recipies cannot be stored. Size of storage increases with bin size.</li>
-				<li class="refactor">Dispenser: Allows reagents to be color coded by pH</li>
-				<li class="refactor">Dispenser: Each reagent displays it's pH on hover</li>
-				<li class="refactor">Dispenser: Allows the user to toggle between buttons and a radial dial</li>
-				<li class="refactor">Dispenser: When the dispencer is upgraded it can dispense 5/3/2/1 volumes based on rating refactor: Dispenser: as it was before. This does not break recorded recipes.</li>
-				<li class="tweak">Adds a round function to some numbers so they're not huge</li>
-				<li class="tweak">The Chem master can now get purity for all reagents when analysed</li>
-				<li class="bugfix">Synthissue fixes</li>
-				<li class="tweak">buffers now have a strong and weak variant. Weak can be dispensed, and strong can be created. Strong buffers are 6x more effective.</li>
-				<li class="bugfix">Some buffer pH edge calculation fixes</li>
-			</ul>
-			<h3 class="author">TyrianTyrell updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">added a signed language, that can't be used over the radio but can be used if you're mute. also added the multilingual trait.</li>
-				<li class="imageadd">hopefully added an icon for the signed language.</li>
-				<li class="code_imp">changed how some traits function slightly.</li>
-			</ul>
-			<h3 class="author">dzahlus updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">tweaked a few sounds</li>
-				<li class="soundadd">added a new weapon sounds</li>
-				<li class="sounddel">removed old weapon sounds</li>
-				<li class="code_imp">changed some sound related code</li>
-			</ul>
-			<h3 class="author">silicons updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">syndicate ablative armwraps have been added.</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>

html/changelogs/.all_changelog.yml

@@ -29010,3 +29010,16 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: Added Telescopic Baseball Bat to Stealthy uplink items
   - rscadd: Added sprites for Telescopic Baseball Bat
   - rscadd: Added Telescopic Baseball Bat to Baseball kit under uplink bundles
+2021-04-12:
+  BlueWildrose:
+  - bugfix: Fixed female slime-subspecies left/right sprites being flipped
+  - bugfix: Fixed drones nullspacing things they try to place on tables and in closets
+  - bugfix: Fixed phantom mob-holder items. You can now grab Ian from your backpack
+      without any issues.
+  silicons:
+  - balance: gold cores can spawn simplemob xenos again.
+  timothyteakettle:
+  - config: makes AGE_VERIFICATION option off by default
+2021-04-13:
+  rossark:
+  - bugfix: wrong word