diff --git a/src/dehacked.c b/src/dehacked.c
index 8eb248baa05d38fd19ff3b2df8cda92cbfd5d8c0..b6f7db571236d9411316cfbd515f00bc15b64e08 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -5338,7 +5338,14 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
// Xmas-specific stuff
"S_XMASPOLE",
"S_CANDYCANE",
- "S_SNOWMAN",
+ "S_SNOWMAN", // normal
+ "S_SNOWMANHAT", // with hat + scarf
+ "S_LAMPPOST1", // normal
+ "S_LAMPPOST2", // with snow
+ "S_HANGSTAR",
+ // Xmas GFZ bushes
+ "S_XMASBERRYBUSH",
+ "S_XMASBUSH",
// Botanic Serenity's loads of scenery states
"S_BSZTALLFLOWER_RED",
@@ -6616,7 +6623,14 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s
// Christmas Scenery
"MT_XMASPOLE",
"MT_CANDYCANE",
- "MT_SNOWMAN",
+ "MT_SNOWMAN", // normal
+ "MT_SNOWMANHAT", // with hat + scarf
+ "MT_LAMPPOST1", // normal
+ "MT_LAMPPOST2", // with snow
+ "MT_HANGSTAR",
+ // Xmas GFZ bushes
+ "MT_XMASBERRYBUSH",
+ "MT_XMASBUSH",
// Botanic Serenity
"MT_BSZTALLFLOWER_RED",
diff --git a/src/info.c b/src/info.c
index 1d807ac1ad5e189e8878e9938807deabe45e5b97..cb0cde9966f2351aea8f2e39243160dfd6cb7391 100644
--- a/src/info.c
+++ b/src/info.c
@@ -219,9 +219,11 @@ char sprnames[NUMSPRITES + 1][5] =
// Egg Rock Scenery
// Christmas Scenery
- "XMS1",
- "XMS2",
- "XMS3",
+ "XMS1", // Christmas Pole
+ "XMS2", // Candy Cane
+ "XMS3", // Snowman
+ "XMS4", // Lamppost
+ "XMS5", // Hanging Star
// Botanic Serenity Scenery
"BSZ1", // Tall flowers
@@ -1933,6 +1935,13 @@ state_t states[NUMSTATES] =
{SPR_XMS1, 0, -1, {NULL}, 0, 0, S_NULL}, // S_XMASPOLE
{SPR_XMS2, 0, -1, {NULL}, 0, 0, S_NULL}, // S_CANDYCANE
{SPR_XMS3, 0, -1, {NULL}, 0, 0, S_NULL}, // S_SNOWMAN
+ {SPR_XMS3, 1, -1, {NULL}, 0, 0, S_NULL}, // S_SNOWMANHAT
+ {SPR_XMS4, 0, -1, {NULL}, 0, 0, S_NULL}, // S_LAMPPOST1
+ {SPR_XMS4, 1, -1, {NULL}, 0, 0, S_NULL}, // S_LAMPPOST2
+ {SPR_XMS5, 0, -1, {NULL}, 0, 0, S_NULL}, // S_HANGSTAR
+ // Xmas GFZ bushes
+ {SPR_BUS1, 1, -1, {NULL}, 0, 0, S_NULL}, // S_BERRYBUSH
+ {SPR_BUS2, 1, -1, {NULL}, 0, 0, S_NULL}, // S_BUSH
// Loads of Botanic Serenity bullshit
{SPR_BSZ1, 0, -1, {NULL}, 0, 0, S_NULL}, // S_BSZTALLFLOWER_RED
@@ -9511,7 +9520,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
sfx_None, // deathsound
25*FRACUNIT, // speed
16*FRACUNIT, // radius
- 40*FRACUNIT, // height
+ 64*FRACUNIT, // height
0, // display offset
100, // mass
1, // damage
@@ -9520,6 +9529,168 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL // raisestate
},
+ { // MT_SNOWMANHAT
+ 1853, // doomednum
+ S_SNOWMANHAT, // spawnstate
+ 1000, // spawnhealth
+ S_NULL, // seestate
+ sfx_None, // seesound
+ 8, // reactiontime
+ sfx_None, // attacksound
+ S_NULL, // painstate
+ 0, // painchance
+ sfx_None, // painsound
+ S_NULL, // meleestate
+ S_NULL, // missilestate
+ S_NULL, // deathstate
+ S_NULL, // xdeathstate
+ sfx_None, // deathsound
+ 25*FRACUNIT, // speed
+ 16*FRACUNIT, // radius
+ 80*FRACUNIT, // height
+ 0, // display offset
+ 100, // mass
+ 1, // damage
+ sfx_None, // activesound
+ MF_SLIDEME|MF_SOLID|MF_PUSHABLE, // flags
+ S_NULL // raisestate
+ },
+
+ { // MT_LAMPPOST1
+ 1854, // doomednum
+ S_LAMPPOST1, // spawnstate
+ 1000, // spawnhealth
+ S_NULL, // seestate
+ sfx_None, // seesound
+ 8, // reactiontime
+ sfx_None, // attacksound
+ S_NULL, // painstate
+ 0, // painchance
+ sfx_None, // painsound
+ S_NULL, // meleestate
+ S_NULL, // missilestate
+ S_NULL, // deathstate
+ S_NULL, // xdeathstate
+ sfx_None, // deathsound
+ 0, // speed
+ 8*FRACUNIT, // radius
+ 120*FRACUNIT, // height
+ 0, // display offset
+ 100, // mass
+ 1, // damage
+ sfx_None, // activesound
+ MF_SOLID, // flags
+ S_NULL // raisestate
+ },
+
+ { // MT_LAMPPOST2
+ 1855, // doomednum
+ S_LAMPPOST2, // spawnstate
+ 1000, // spawnhealth
+ S_NULL, // seestate
+ sfx_None, // seesound
+ 8, // reactiontime
+ sfx_None, // attacksound
+ S_NULL, // painstate
+ 0, // painchance
+ sfx_None, // painsound
+ S_NULL, // meleestate
+ S_NULL, // missilestate
+ S_NULL, // deathstate
+ S_NULL, // xdeathstate
+ sfx_None, // deathsound
+ 0, // speed
+ 8*FRACUNIT, // radius
+ 120*FRACUNIT, // height
+ 0, // display offset
+ 100, // mass
+ 1, // damage
+ sfx_None, // activesound
+ MF_SOLID, // flags
+ S_NULL // raisestate
+ },
+
+ { // MT_HANGSTAR
+ 1856, // doomednum
+ S_HANGSTAR, // spawnstate
+ 1000, // spawnhealth
+ S_NULL, // seestate
+ sfx_None, // seesound
+ 8, // reactiontime
+ sfx_None, // attacksound
+ S_NULL, // painstate
+ 0, // painchance
+ sfx_None, // painsound
+ S_NULL, // meleestate
+ S_NULL, // missilestate
+ S_NULL, // deathstate
+ S_NULL, // xdeathstate
+ sfx_None, // deathsound
+ 0, // speed
+ 4*FRACUNIT, // radius
+ 80*FRACUNIT, // height
+ 0, // display offset
+ 100, // mass
+ 1, // damage
+ sfx_None, // activesound
+ MF_NOBLOCKMAP|MF_NOCLIP|MF_SPAWNCEILING|MF_NOGRAVITY|MF_SCENERY, // flags
+ S_NULL // raisestate
+ },
+
+ { // MT_XMASBERRYBUSH
+ 1857, // doomednum
+ S_XMASBERRYBUSH, // spawnstate
+ 1000, // spawnhealth
+ S_NULL, // seestate
+ sfx_None, // seesound
+ 8, // reactiontime
+ sfx_None, // attacksound
+ S_NULL, // painstate
+ 0, // painchance
+ sfx_None, // painsound
+ S_NULL, // meleestate
+ S_NULL, // missilestate
+ S_NULL, // deathstate
+ S_NULL, // xdeathstate
+ sfx_None, // deathsound
+ 0, // speed
+ 16*FRACUNIT, // radius
+ 32*FRACUNIT, // height
+ 0, // display offset
+ 100, // mass
+ 0, // damage
+ sfx_None, // activesound
+ MF_NOTHINK|MF_NOBLOCKMAP|MF_NOCLIP|MF_SCENERY, // flags
+ S_NULL // raisestate
+ },
+
+ { // MT_XMASBUSH
+ 1858, // doomednum
+ S_XMASBUSH, // spawnstate
+ 1000, // spawnhealth
+ S_NULL, // seestate
+ sfx_None, // seesound
+ 8, // reactiontime
+ sfx_None, // attacksound
+ S_NULL, // painstate
+ 0, // painchance
+ sfx_None, // painsound
+ S_NULL, // meleestate
+ S_NULL, // missilestate
+ S_NULL, // deathstate
+ S_NULL, // xdeathstate
+ sfx_None, // deathsound
+ 0, // speed
+ 16*FRACUNIT, // radius
+ 32*FRACUNIT, // height
+ 0, // display offset
+ 100, // mass
+ 0, // damage
+ sfx_None, // activesound
+ MF_NOTHINK|MF_NOBLOCKMAP|MF_NOCLIP|MF_SCENERY, // flags
+ S_NULL // raisestate
+ },
+
// No, I did not do all of this by hand.
// I made a script to make all of these for me.
// Ha HA. ~Inuyasha
diff --git a/src/info.h b/src/info.h
index 33bfcf19e62f89f05642430df80e353d31ea06a1..a123ba81c2f4e3cb43aa37cf2f702ec907ef5355 100644
--- a/src/info.h
+++ b/src/info.h
@@ -425,9 +425,11 @@ typedef enum sprite
// Egg Rock Scenery
// Christmas Scenery
- SPR_XMS1,
- SPR_XMS2,
- SPR_XMS3,
+ SPR_XMS1, // Christmas Pole
+ SPR_XMS2, // Candy Cane
+ SPR_XMS3, // Snowman
+ SPR_XMS4, // Lamppost
+ SPR_XMS5, // Hanging Star
// Botanic Serenity Scenery
SPR_BSZ1, // Tall flowers
@@ -2133,7 +2135,14 @@ typedef enum state
// Xmas-specific stuff
S_XMASPOLE,
S_CANDYCANE,
- S_SNOWMAN,
+ S_SNOWMAN, // normal
+ S_SNOWMANHAT, // with hat + scarf
+ S_LAMPPOST1, // normal
+ S_LAMPPOST2, // with snow
+ S_HANGSTAR,
+ // Xmas GFZ bushes
+ S_XMASBERRYBUSH,
+ S_XMASBUSH,
// Botanic Serenity's loads of scenery states
S_BSZTALLFLOWER_RED,
@@ -3430,7 +3439,14 @@ typedef enum mobj_type
// Christmas Scenery
MT_XMASPOLE,
MT_CANDYCANE,
- MT_SNOWMAN,
+ MT_SNOWMAN, // normal
+ MT_SNOWMANHAT, // with hat + scarf
+ MT_LAMPPOST1, // normal
+ MT_LAMPPOST2, // with snow
+ MT_HANGSTAR,
+ // Xmas GFZ bushes
+ MT_XMASBERRYBUSH,
+ MT_XMASBUSH,
// Botanic Serenity scenery
MT_BSZTALLFLOWER_RED,
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 520f9ad07d45a1da1f4b102e9ad7886029861862..b7cb83881e96cf1d116a34201c619c06a4bdb1b9 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -8434,6 +8434,10 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
case MT_SPIKE:
mobj->flags2 |= MF2_STANDONME;
break;
+ case MT_LAMPPOST1:
+ case MT_LAMPPOST2:
+ mobj->flags2 |= MF2_STANDONME;
+ break;
case MT_DETON:
mobj->movedir = 0;
break;