601c842d13
Added Drakeborgs for sillicons along with plushies
2021-01-06 19:52:47 +00:00
f441be96b0
Merge pull request #1063 from CHOMPStationBot/upstream-merge-9520
...
[MIRROR] Ports Vox Plushie from Paradise
2021-01-03 21:57:39 -05:00
7e16cd134a
Merge pull request #9527 from VOREStation/upstream-merge-7780
...
[MIRROR] Adds a Whip.
2020-12-28 17:12:39 +00:00
d96a127b4a
Ports Vox Plushie from Paradise
2020-12-26 01:59:20 +00:00
fd7310af15
ITG IDs and a small Dauntless refit
2020-12-23 14:19:56 +00:00
750c1f140c
Merge pull request #1010 from CHOMPStationBot/upstream-merge-9455
...
[MIRROR] [MIRROR] RPED QoL Tweak(s)/Unimplemented RPED Variant
2020-12-19 18:29:07 -05:00
d15968eff6
Last Christmas!
...
Final adjustments to the presents!
New fat taur sprite with three colors and a vulp skullmask that totally doesnt look like Churo from Different (TM)! Sprites made by our good friend Blitzkrieg
Merry Christmas all!
2020-12-18 17:38:55 +01:00
7efe6f2cad
Auto stash before rebase of "CHOMPStation2/master"
2020-12-18 17:02:15 +01:00
9fb6636f71
Merge pull request #1029 from Shadowfire117/ExtraMas
...
Christmas time is once a year..
2020-12-17 19:04:30 -05:00
6b70b133ba
Christmas time is once a year..
...
Made changes to allow casino manual to fit into the casino wallet for easy reading.
Made Santa's sack! Only he can take presents from it!
Made the new presents have a nice wide selection of gifts, but chaos presents are disabled so far!
Fixed 'the cake' somewhat and made a grenade to spawn its components.
made Santa's coat.
made an overdrive version of the confetti gun.
2020-12-17 17:20:24 +01:00
2718d0bbbe
Merge pull request #1016 from Shadowfire117/ChristmasCasino
...
So this is Christmas...
2020-12-17 04:17:30 -05:00
b2dfb35c54
So this is Christmas...
...
Made fake presents for decoration purposes
Made fake snowfall effect for mood
Made advanced presents that have randomized size and shape, will have a bigger selection of possible gifts in update along with a rare chaos version that will have it's own smaller but much powerful items!
Made new id sprites and access cards for casino medical/security/engineering
Took the old girl out back and put her down, sorry Casino Ferry, you served us all well!
And a big big rework and remapping of casino and disabled it from round start to ease up on processing, sorry kids. No snooping the goods from now on!
2020-12-15 01:43:30 +01:00
6127c5d2e9
Merge pull request #9455 from VOREStation/upstream-merge-7784
...
[MIRROR] RPED QoL Tweak(s)/Unimplemented RPED Variant
2020-12-14 03:05:22 +00:00
ac10917edb
Merge pull request #975 from CHOMPStationBot/upstream-merge-9421
...
[MIRROR] polaris#7778 earlyport - A Thing About Digging Sand and Mineral Processor Speed
2020-12-13 21:07:30 -05:00
0cb47f9a19
Merge pull request #980 from CHOMPStationBot/upstream-merge-9422
...
[MIRROR] [MIRROR] Plainleather & Tobacco
2020-12-08 03:14:03 -05:00
cd1ad32cb2
Merge pull request #9422 from VOREStation/upstream-merge-7762
...
[MIRROR] Plainleather & Tobacco
2020-12-08 03:38:26 +00:00
6bd329bd30
Merge pull request #9427 from VOREStation/upstream-merge-7777
...
[MIRROR] Modular honks
2020-12-08 03:36:15 +00:00
f80607ae84
polaris#7778 earlyport - A Thing About Digging Sand and Mineral Processor Speed
2020-12-07 17:03:03 +00:00
6df859e88e
Merge pull request #915 from Shadow-Quill/PDTurrets
...
Adds Point Defence Turrets
2020-12-02 15:54:47 -07:00
a9f77823d7
Merge pull request #9333 from Tenryumi/nikki-fluff
...
Adds Nikki's Fluff Outfit For Nikki, + Rigsuit-Mounted Size Guns For Research
2020-11-30 23:46:15 +00:00
9ba21cd2e0
Updoots
2020-11-30 16:30:19 -06:00
49ae612dc4
Maybe forgot this
2020-11-25 19:44:55 -08:00
f1c9b60bf8
Fuck okay maybe intercoms move sometimes
2020-11-24 23:24:36 -08:00
d260757e91
yumyum radio go vroom hehe
2020-11-24 22:45:41 -08:00
f0ace37d4f
Spear and Gun sizes
...
-Made all gun and spear sizes larger so that they will no longer fit into backpacks.
--Energy spears and energy swords will fit while deactivated, but not while active (unchanged)
-Tweaked the Floragun have no recoil for micros.
2020-11-23 19:29:48 -07:00
7626117811
I forgot to delete these oops
2020-11-22 21:43:20 -08:00
c55132d06d
Finally optimize radios
2020-11-22 21:20:05 -08:00
bf396e0a12
Merge pull request #843 from CHOMPStationBot/upstream-merge-9263
...
[MIRROR] [MIRROR] Adds AlliCo Grab-A-Gift
2020-11-15 13:48:10 -08:00
5afa72a83e
Merge pull request #844 from CHOMPStation2/metroid
...
Current Metroid Progress
2020-11-15 13:59:33 -07:00
4d2f915f33
Merge master and build TGUI
2020-11-15 02:17:53 -08:00
1db7b1d2e6
Merge pull request #845 from CHOMPStationBot/upstream-merge-9304
...
[MIRROR] Balance fixes and bugfixes
2020-11-15 02:07:40 -08:00
2b178a86b0
hhhhhhhhhh
2020-11-14 22:24:25 -07:00
5749453f74
Delete toys_ch.dm
2020-11-14 22:24:08 -07:00
02d51b5756
Merge branch 'master' into metroid
2020-11-14 15:25:04 -07:00
1efc4bcd9f
Merge pull request #9304 from Novacat/nova-basicfixes
...
Balance fixes and bugfixes
2020-11-14 17:54:59 +00:00
7b5fc6d721
Add files via upload
2020-11-14 04:29:40 -07:00
faa287d91b
[MIRROR] Adds AlliCo Grab-A-Gift
2020-11-14 07:32:50 +00:00
8fce3fe4b6
Merge pull request #825 from Darlantanis/StarcasterFix
...
Converts Starcaster to tgui
2020-11-13 00:26:46 -07:00
0e07c9a739
Merge pull request #824 from r4d6/cigar
...
Add cigar cases to the loadout
2020-11-11 19:30:25 -07:00
613033221d
trying to appease travis some more
2020-11-11 16:52:47 -08:00
e0c685e59a
travis is a bitch
2020-11-11 16:01:57 -08:00
9f54f4fb3d
stupid runtime reee
2020-11-11 15:34:13 -08:00
cfc8f579a2
Added spicy tools
2020-11-11 15:07:16 -08:00
61f46ab35f
Converts starcaster to tgui
2020-11-10 06:40:19 -05:00
d628ce8ff4
Move the cigar cases to a new _ch file
2020-11-10 00:04:17 -05:00
d0cbf7f856
Add cigar cases to the loadout.
2020-11-09 19:23:00 -05:00
5d1977b324
Merge pull request #817 from CHOMPStationBot/upstream-merge-9287
...
[MIRROR] [MIRROR] Fresh Meat, Leatherworking
2020-11-08 23:41:34 -07:00
018d176c51
[MIRROR] Fresh Meat, Leatherworking
2020-11-08 17:04:32 +00:00
a269d28a8b
Merge pull request #805 from CHOMPStationBot/upstream-merge-9276
...
[MIRROR] [MIRROR] No more unnearsightedness!
2020-11-05 03:19:31 -07:00
a8aedccb38
Merge pull request #9276 from VOREStation/upstream-merge-7753
...
[MIRROR] No more unnearsightedness!
2020-11-05 10:06:02 +00:00
Chompstation Bot