Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
b2f41f9
Fix reagent holders being cleared when approximately 0 units are tran…
out-of-phaze Feb 13, 2026
af2fbfb
Fix passports spawning on the floor
out-of-phaze Feb 13, 2026
201c8d6
Merge pull request #5299 from out-of-phaze/fix/passport-drop
out-of-phaze Feb 14, 2026
a51c216
Merge pull request #5298 from out-of-phaze/stable-fix/clear-transfer
out-of-phaze Feb 14, 2026
ccbc020
shotgun icon fix
Feb 16, 2026
973ac96
skin color is preserved by rejuv
l3lb0t Feb 16, 2026
0b2567e
Merge pull request #5303 from l3lb0t/shotgun-stable
MistakeNot4892 Feb 17, 2026
0902a46
Merge pull request #5304 from l3lb0t/skin-stable
MistakeNot4892 Feb 17, 2026
2702231
Merge pull request #5305 from NebulaSS13/stable
MistakeNot4892 Feb 18, 2026
4b2bc28
fixes plate carriers being invisible
l3lb0t Feb 19, 2026
e51aaa1
Merge pull request #5306 from l3lb0t/plate-carrier
MistakeNot4892 Feb 21, 2026
f80b654
Fixes issues with moving off open spaces.
MistakeNot4892 Feb 23, 2026
3a4cd9d
Automatic changelog generation [ci skip]
NebulaSS13Bot Mar 3, 2026
e1624d9
Automatic changelog generation [ci skip]
NebulaSS13Bot Mar 4, 2026
40c3ff6
Automatic changelog generation [ci skip]
NebulaSS13Bot Mar 6, 2026
626232d
Merge pull request #5308 from MistakeNot4892/dev
out-of-phaze Mar 7, 2026
3189278
Automatic changelog generation [ci skip]
NebulaSS13Bot Mar 10, 2026
23c21fe
fixes random spawner
Sypsoti Mar 10, 2026
6dab562
Merge pull request #5309 from Sypsoti/randomspawner_fix
MistakeNot4892 Mar 11, 2026
ef6e4fe
Automatic changelog generation [ci skip]
NebulaSS13Bot Mar 14, 2026
4e4ab9b
switching to stable
Sypsoti Mar 14, 2026
ae8d874
Garlic Oil now treats infections
Typhin Mar 14, 2026
ea58b7b
Merge pull request #5311 from Typhin/stable
MistakeNot4892 Mar 15, 2026
c0bb008
Merge pull request #5310 from Sypsoti/telecommsvarfix
MistakeNot4892 Mar 15, 2026
a33c3a5
Merge pull request #5312 from NebulaSS13/stable
MistakeNot4892 Mar 15, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/game/objects/random/random.dm
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
if(!type_to_spawn)
return

for(var/atom/A as anything in create_instance(type_to_spawn))
for(var/atom/A as anything in create_instance(type_to_spawn, loc))
if(pixel_x || pixel_y)
A.default_pixel_x = pixel_x
A.default_pixel_y = pixel_y
Expand Down
2 changes: 1 addition & 1 deletion code/game/turfs/turf.dm
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@
var/old_height = old_turf.get_physical_height() + REAGENT_TOTAL_VOLUME(old_turf.reagents)
var/current_height = get_physical_height() + REAGENT_TOTAL_VOLUME(reagents)
if(abs(current_height - old_height) > FLUID_SHALLOW)
if(current_height > old_height)
if(current_height > old_height && !is_open() && !old_turf?.is_open()) // check is_open() due to open turf depth stuff.
return 0
if(istype(mover_mob) && MOVING_DELIBERATELY(mover_mob))
to_chat(mover_mob, SPAN_WARNING("You refrain from stepping over the edge; it looks like a steep drop down to \the [src]."))
Expand Down
1 change: 1 addition & 0 deletions code/modules/clothing/armor_attachment/plate.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
/decl/material/solid/metal/steel = MATTER_AMOUNT_SECONDARY
)
origin_tech = @'{"materials":1,"engineering":1,"combat":1}'
draw_on_mob_when_equipped = FALSE

/obj/item/clothing/armor_attachment/plate/get_fibers()
return null //plates do not shed
Expand Down
1 change: 0 additions & 1 deletion code/modules/clothing/suits/armor/plate_carrier.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
restricted_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA, ACCESSORY_SLOT_ARMOR_C, ACCESSORY_SLOT_ARMOR_A, ACCESSORY_SLOT_ARMOR_L, ACCESSORY_SLOT_ARMOR_S)
material = /decl/material/solid/organic/leather
starting_accessories = null
draw_on_mob_when_equipped = FALSE

/obj/item/clothing/suit/armor/pcarrier/light
starting_accessories = list(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ var/global/list/telecomms_hubs = list()
listeners[ghost_listener] = TRUE

for(var/mob/listener in listeners)
listener.hear_radio(message, message_verb, speaking, formatted_msg, "</span> <span class='message'>", "</span></span>", speaker, message_compression, vname = send_name, vsource = (listeners[listener] ? send_overmap_object.name : null))
listener.hear_radio(message, message_verb, speaking, formatted_msg, "</span> <span class='message'>", "</span></span>", speaker, message_compression, vname = send_name, vsource = (listeners[listener] ? send_overmap_object?.name : null))

if(!chain_transmit)
return
Expand Down
2 changes: 2 additions & 0 deletions code/modules/organs/external/_external.dm
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,8 @@

/obj/item/organ/external/copy_from_mob_snapshot(datum/mob_snapshot/supplied_appearance)
_icon_cache_key = null
skin_colour = supplied_appearance.skin_color //match skin colors
skin_tone = supplied_appearance.skin_tone
if(organ_tag in supplied_appearance?.sprite_accessories)
var/list/sprite_cats = supplied_appearance.sprite_accessories[organ_tag]
for(var/category in sprite_cats)
Expand Down
6 changes: 6 additions & 0 deletions code/modules/projectiles/guns/projectile/shotgun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@
else
icon_state = "[get_world_inventory_state()]-empty"

/obj/item/gun/projectile/shotgun/pump/update_base_icon_state()
if(chambered)
icon_state = get_world_inventory_state()
else
icon_state = "[get_world_inventory_state()]-empty"

/obj/item/gun/projectile/shotgun/pump/consume_next_projectile()
if(chambered)
return chambered.BB
Expand Down
9 changes: 7 additions & 2 deletions code/modules/reagents/Chemistry-Holder.dm
Original file line number Diff line number Diff line change
Expand Up @@ -502,6 +502,8 @@ var/global/datum/reagents/sink/infinite_reagent_sink = new
/// Removes up to [amount] of reagents from [src]. Returns actual amount removed.
/datum/reagents/proc/remove_any(var/amount = 1, var/defer_update = FALSE, var/removed_phases = (MAT_PHASE_LIQUID | MAT_PHASE_SOLID), skip_reagents = null)

amount = CHEMS_QUANTIZE(amount)

if(amount <= 0)
return 0

Expand Down Expand Up @@ -537,8 +539,11 @@ var/global/datum/reagents/sink/infinite_reagent_sink = new
else
return 0

var/removing = clamp(CHEMS_QUANTIZE(amount), 0, total_volume) // not ideal but something is making total_volume become NaN
if(!removing || total_volume <= 0)
var/removing = clamp(amount, 0, total_volume) // not ideal but something is making total_volume become NaN
if(!removing)
return 0 // don't clear, we aren't removing any

if(total_volume <= removing) // we're removing everything
. = 0
clear_reagents()
return
Expand Down
1 change: 1 addition & 0 deletions code/modules/reagents/chems/chems_drinks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@
color = "#eeddcc"
uid = "chem_drink_garlic"
antibiotic_strength = 0.65
affect_blood_on_ingest = TRUE

glass_name = "garlic oil"
glass_desc = "A potion of guaranteed bad breath."
Expand Down
30 changes: 0 additions & 30 deletions html/changelog.html
Original file line number Diff line number Diff line change
Expand Up @@ -51,36 +51,6 @@

-->
<div class="commit sansserif">

<h2 class="date">10 January 2026</h2>
<h3 class="author">Penelope Haze updated:</h3>
<ul class="changes bgimages16">
<li class="balance">Certain supply packs that give a random selection are now priced more fairly.</li>
</ul>

<h2 class="date">06 January 2026</h2>
<h3 class="author">MistakeNot4892 updated:</h3>
<ul class="changes bgimages16">
<li class="tweak">Internal code for neo-avian markings has been reworked, check your sprite accessories.</li>
</ul>

<h2 class="date">02 January 2026</h2>
<h3 class="author">Sutures updated:</h3>
<ul class="changes bgimages16">
<li class="tweak">The equip hotkey can now place items into backpacks and wallets.</li>
</ul>

<h2 class="date">31 December 2025</h2>
<h3 class="author">Penelope Haze updated:</h3>
<ul class="changes bgimages16">
<li class="admin">Kharmaan nymph jobbans now use the "Mantid Nymph" role in the jobban menu, rather than the Semi-Antagonist role.</li>
</ul>

<h2 class="date">30 December 2025</h2>
<h3 class="author">Penelope Haze updated:</h3>
<ul class="changes bgimages16">
<li class="tweak">Iron can now optionally be used instead of aluminum when filling sealant tanks for sealant guns.</li>
</ul>
</div>
</td></tr></table>
</body>
Expand Down
2 changes: 1 addition & 1 deletion maps/~mapsystem/maps.dm
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,7 @@ var/global/const/MAP_HAS_RANK = 2 //Rank system, also toggleable
var/obj/item/passport/pass = new passport_type(get_turf(H))
if(istype(pass))
pass.set_info(H)
if(!H.equip_to_slot(pass, slot_in_wallet_str) && !H.equip_to_slot(pass, slot_in_backpack_str))
if(!H.equip_to_slot_if_possible(pass, slot_in_wallet_str, del_on_fail=FALSE, disable_warning=TRUE) && !H.equip_to_slot_if_possible(pass, slot_in_backpack_str, del_on_fail=FALSE, disable_warning=TRUE))
H.put_in_hands(pass)

/datum/map/proc/populate_overmap_events()
Expand Down
Loading