Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13 int…
Browse files Browse the repository at this point in the history
…o conscripts-gone
  • Loading branch information
AmoryBlaine committed Aug 19, 2024
2 parents 8623987 + cc1a70b commit 7a2fe2c
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 1 deletion.
3 changes: 3 additions & 0 deletions code/_globalvars/bitfields.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/guns/pistols.dm
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,7 @@
desc = "Standard issue USCM firearm. Also found in the hands of Weyland-Yutani PMC teams. Fires 9mm armor shredding rounds and is capable of 3-round burst."
icon = 'icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi'
icon_state = "_88m4" // to comply with css standards
item_state = "88m4"
item_state = "_88m4"
fire_sound = "88m4"
firesound_volume = 20
reload_sound = 'sound/weapons/gun_88m4_reload.ogg'
Expand Down
4 changes: 4 additions & 0 deletions html/changelogs/AutoChangeLog-pr-390.yml
Original file line number Diff line number Diff line change
@@ -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"
4 changes: 4 additions & 0 deletions html/changelogs/AutoChangeLog-pr-391.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
author: "Doubleumc"
delete-after: True
changes:
- bugfix: "Fixed the 88 Mod 4 pistol's holster sprite."
Binary file modified icons/mob/humans/onmob/items_lefthand_1.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/items_righthand_1.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/belts.dmi
Binary file not shown.

0 comments on commit 7a2fe2c

Please sign in to comment.