diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm index eedfcd6f92..d3f533c687 100644 --- a/code/_globalvars/bitfields.dm +++ b/code/_globalvars/bitfields.dm @@ -414,6 +414,7 @@ DEFINE_BITFIELD(flags_round_type, list( "MODE_RANDOM_HIVE" = MODE_RANDOM_HIVE, "MODE_THUNDERSTORM" = MODE_THUNDERSTORM, "MODE_FACTION_CLASH" = MODE_FACTION_CLASH, + "MODE_NO_XENO_EVOLVE" = MODE_NO_XENO_EVOLVE, )) DEFINE_BITFIELD(toggleable_flags, list( @@ -426,8 +427,10 @@ DEFINE_BITFIELD(toggleable_flags, list( "MODE_NO_COMBAT_CAS" = MODE_NO_COMBAT_CAS, "MODE_LZ_PROTECTION" = MODE_LZ_PROTECTION, "MODE_SHIPSIDE_SD" = MODE_SHIPSIDE_SD, + "MODE_HARDCORE_PERMA" = MODE_HARDCORE_PERMA, "MODE_DISPOSABLE_MOBS" = MODE_DISPOSABLE_MOBS, "MODE_BYPASS_JOE" = MODE_BYPASS_JOE, + "MODE_NO_JOIN_AS_XENO" = MODE_NO_JOIN_AS_XENO, )) DEFINE_BITFIELD(state, list( diff --git a/html/changelogs/AutoChangeLog-pr-390.yml b/html/changelogs/AutoChangeLog-pr-390.yml new file mode 100644 index 0000000000..6ac1d031b5 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-390.yml @@ -0,0 +1,4 @@ +author: "Doubleumc" +delete-after: True +changes: + - admin: "bitfields for MODE_NO_XENO_EVOLVE, MODE_HARDCORE_PERMA, and MODE_NO_JOIN_AS_XENO now work" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-391.yml b/html/changelogs/AutoChangeLog-pr-391.yml new file mode 100644 index 0000000000..5cda1f45df --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-391.yml @@ -0,0 +1,4 @@ +author: "Doubleumc" +delete-after: True +changes: + - bugfix: "Fixed the 88 Mod 4 pistol's holster sprite." \ No newline at end of file diff --git a/icons/obj/items/clothing/belts.dmi b/icons/obj/items/clothing/belts.dmi index 18e011f048..4e9a85cc90 100644 Binary files a/icons/obj/items/clothing/belts.dmi and b/icons/obj/items/clothing/belts.dmi differ