Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TGMC Christmas 2024 #16820

Open
wants to merge 29 commits into
base: master
Choose a base branch
from
+10,719 −1,452
Open

TGMC Christmas 2024 #16820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
6d9eaaa
should fix most of the code issues
RipGrayson Dec 17, 2024
ab85ca8
should fix everything
RipGrayson Dec 17, 2024
ff60124
fixes two errors
RipGrayson Dec 17, 2024
cc841a4
another fix
RipGrayson Dec 17, 2024
3d66db4
adds meme tree to eorg
RipGrayson Dec 17, 2024
c19ab5f
fixes shuttles not being festive
RipGrayson Dec 17, 2024
5d779d5
fixes med pouches
RipGrayson Dec 20, 2024
312cc94
fixes issues
RipGrayson Dec 23, 2024
364275a
unbugs santa and elf costumes, fixes tree
RipGrayson Dec 23, 2024
0d8e755
fixes
RipGrayson Dec 24, 2024
5f31f4a
adds entirely unfinished grinch content
RipGrayson Dec 25, 2024
c1cf998
lower probability
RipGrayson Dec 25, 2024
7a452fb
sometimes I really hate DM
RipGrayson Dec 25, 2024
62ddaa2
another minor fix
RipGrayson Dec 25, 2024
a8795ac
fixes out of order entry in dme
RipGrayson Dec 25, 2024
0b902e0
more work
RipGrayson Dec 25, 2024
c0dbbc3
might fix
RipGrayson Dec 25, 2024
1eac77f
nevermind tomorrow it is
RipGrayson Dec 25, 2024
d54bc60
let's see if this works
RipGrayson Dec 25, 2024
63cc69e
does this work
RipGrayson Dec 25, 2024
64c96c5
probably final changes
RipGrayson Dec 25, 2024
aaa5471
minor changes
RipGrayson Dec 25, 2024
1e7c692
adds some icons
RipGrayson Dec 25, 2024
89a7cd0
adjust some skills
RipGrayson Dec 25, 2024
e33e175
more work
RipGrayson Dec 25, 2024
122bfb5
fixes typo
RipGrayson Dec 25, 2024
1d3d04b
fixes some issues
RipGrayson Dec 25, 2024
c9a0d64
nobody cared who the grinch was until they took off the mask
RipGrayson Dec 25, 2024
5dc57b4
last change
RipGrayson Dec 26, 2024
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
1,352 changes: 1,152 additions & 200 deletions _maps/map_files/Arachne/TGS_Arachne.dmm
View file
Open in desktop

Large diffs are not rendered by default.

1,518 changes: 1,276 additions & 242 deletions _maps/map_files/Pillar_of_Spring/TGS_Pillar_of_Spring.dmm
View file
Open in desktop

Large diffs are not rendered by default.

2,252 changes: 1,971 additions & 281 deletions _maps/map_files/Sulaco/TGS_Sulaco.dmm
View file
Open in desktop

Large diffs are not rendered by default.

2,548 changes: 2,108 additions & 440 deletions _maps/map_files/Theseus/TGS_Theseus.dmm
View file
Open in desktop

Large diffs are not rendered by default.

573 changes: 476 additions & 97 deletions _maps/map_files/generic/Admin_Level.dmm
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 6 additions & 2 deletions _maps/modularmaps/EORG/basketball.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,6 @@
/obj/effect/turf_decal/warning_stripes/nscenter,
/obj/effect/turf_decal/warning_stripes,
/obj/item/toy/beach_ball/basketball,
/obj/effect/landmark/weapon_spawn/tier5_weapon_spawn,
/obj/machinery/floodlight/landing/testroom,
/turf/open/floor/wood,
/area/deathmatch)
Expand Down Expand Up @@ -895,6 +894,11 @@
"QG" = (
/turf/open/floor/mainship/blue,
/area/deathmatch)
"QW" = (
/obj/effect/turf_decal/warning_stripes/nscenter,
/obj/structure/flora/tree/pine/xmas/presents/guntree,
/turf/open/floor/wood,
/area/deathmatch)
"Rd" = (
/turf/open/floor/mainship/orange{
dir = 4
Expand Down Expand Up @@ -2134,7 +2138,7 @@ ad
ad
dt
aN
ad
QW
ad
ad
ad
Expand Down
6 changes: 5 additions & 1 deletion _maps/modularmaps/EORG/cs_mansion.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,6 +607,10 @@
/obj/structure/largecrate/random/case,
/turf/open/floor/wood/broken,
/area/deathmatch)
"AQ" = (
/obj/structure/flora/tree/pine/xmas/presents/guntree,
/turf/open/floor/grime,
/area/deathmatch)
"Ba" = (
/obj/effect/turf_decal/riverdecal/edge,
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -2458,7 +2462,7 @@ Oh
pS
JS
Oh
Oh
AQ
gr
Oh
Oh
Expand Down
6 changes: 5 additions & 1 deletion _maps/modularmaps/EORG/cs_militia.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@
/obj/structure/window/framed/wood,
/turf/open/floor/wood,
/area/deathmatch)
"hm" = (
/obj/structure/flora/tree/pine/xmas/presents/guntree,
/turf/open/floor/wood,
/area/deathmatch)
"hw" = (
/obj/effect/landmark/weapon_spawn/tier2_weapon_spawn,
/turf/open/floor/plating/asteroidplating{
Expand Down Expand Up @@ -1722,7 +1726,7 @@ uR
Tb
gK
LT
LT
hm
RZ
LT
LT
Expand Down
6 changes: 5 additions & 1 deletion _maps/modularmaps/EORG/cs_office.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -707,6 +707,10 @@
dir = 10
},
/area/deathmatch)
"qS" = (
/obj/structure/flora/tree/pine/xmas/presents/guntree,
/turf/open/floor/tile/dark/gray,
/area/deathmatch)
"qW" = (
/obj/structure/largecrate/random,
/turf/open/floor/plating/ground/snow/layer1,
Expand Down Expand Up @@ -3213,7 +3217,7 @@ vO
ro
AR
Ye
DE
qS
We
ZJ
jg
Expand Down
6 changes: 5 additions & 1 deletion _maps/modularmaps/EORG/de_dust2.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,10 @@
},
/turf/open/floor/plating/ground/dirt,
/area/deathmatch)
"iL" = (
/obj/structure/flora/tree/pine/xmas/presents/guntree,
/turf/open/floor/wood,
/area/deathmatch)
"jk" = (
/obj/effect/landmark/weapon_spawn/tier2_weapon_spawn,
/turf/open/floor/tile,
Expand Down Expand Up @@ -1853,7 +1857,7 @@ FE
FE
mC
Ht
Ht
iL
Bt
Ht
Ht
Expand Down
7 changes: 6 additions & 1 deletion _maps/modularmaps/EORG/de_inferno.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1162,6 +1162,11 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating/asteroidfloor,
/area/deathmatch)
"DW" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/flora/tree/pine/xmas/presents/guntree,
/turf/open/floor/plating/asteroidfloor,
/area/deathmatch)
"EZ" = (
/obj/structure/prop/mainship/valmoric,
/turf/open/floor/grass,
Expand Down Expand Up @@ -3011,8 +3016,8 @@ pj
EZ
NA
rK
vJ
Bs
DW
Xz
fI
KS
Expand Down
6 changes: 5 additions & 1 deletion _maps/modularmaps/EORG/de_nuke.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@
/obj/effect/turf_decal/sandytile/sandyplating,
/turf/closed/wall,
/area/deathmatch)
"dp" = (
/obj/structure/flora/tree/pine/xmas/presents/guntree,
/turf/open/floor/grime,
/area/deathmatch)
"dA" = (
/obj/item/storage/belt/champion,
/turf/open/floor/grime,
Expand Down Expand Up @@ -1441,7 +1445,7 @@ XY
db
zB
JT
JT
dp
dA
JT
JT
Expand Down
6 changes: 5 additions & 1 deletion _maps/modularmaps/EORG/old.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,6 +658,10 @@
/obj/effect/ai_node,
/turf/open/floor,
/area/deathmatch)
"RG" = (
/obj/structure/flora/tree/pine/xmas/presents/guntree,
/turf/open/floor,
/area/deathmatch)
"Sp" = (
/obj/structure/flora/ausbushes/sparsegrass,
/obj/effect/ai_node,
Expand Down Expand Up @@ -1066,7 +1070,7 @@ aQ
bT
aZ
bT
bT
RG
bT
aZ
bT
Expand Down
Loading
Loading