diff --git a/code/datums/diseases/advance/symptoms/heal.dm b/code/datums/diseases/advance/symptoms/heal.dm index c19f23ed2a..f563826eb9 100644 --- a/code/datums/diseases/advance/symptoms/heal.dm +++ b/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(!..()) diff --git a/code/datums/elements/mob_holder.dm b/code/datums/elements/mob_holder.dm index 619f674969..f73826d899 100644 --- a/code/datums/elements/mob_holder.dm +++ b/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() diff --git a/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm b/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm index 5439bbf665..00be08bb1d 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm +++ b/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) diff --git a/code/modules/mob/living/simple_animal/hostile/alien.dm b/code/modules/mob/living/simple_animal/hostile/alien.dm index 05d6eda435..c0a4822b6d 100644 --- a/code/modules/mob/living/simple_animal/hostile/alien.dm +++ b/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 diff --git a/config/config.txt b/config/config.txt index 928b8de125..611d63cb24 100644 --- a/config/config.txt +++ b/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 diff --git a/html/changelog.html b/html/changelog.html index b0b68fbf8f..dbd557e795 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,28 @@ -->
+

13 April 2021

+

rossark updated:

+ + +

12 April 2021

+

BlueWildrose updated:

+ +

silicons updated:

+ +

timothyteakettle updated:

+ +

09 April 2021

BlueWildrose updated:

GoonStation 13 Development Team diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 44ad43ce0a..a0f712739e 100644 --- a/html/changelogs/.all_changelog.yml +++ 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 diff --git a/icons/mob/human_parts_greyscale.dmi b/icons/mob/human_parts_greyscale.dmi index 13f66fc2a4..3b115a1cb0 100644 Binary files a/icons/mob/human_parts_greyscale.dmi and b/icons/mob/human_parts_greyscale.dmi differ