f9f0b60bc5
Update misc.dm
2021-01-07 22:29:39 -05:00
ca1eedb24e
Update misc.dm
2021-01-07 22:24:37 -05:00
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
cdc8abcbb9
Update misc.dm
2021-01-03 21:38:36 -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
70c96548f3
Merge pull request #1051 from CHOMPStationBot/upstream-merge-9495
...
[MIRROR] ITG IDs and a small Dauntless refit
2020-12-25 16:49:07 -05:00
fd7310af15
ITG IDs and a small Dauntless refit
2020-12-23 14:19:56 +00:00
c8e698aac2
Wreck & Debris Field Updates
2020-12-22 15:32:40 +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
178d065096
Merge pull request #1011 from CHOMPStationBot/upstream-merge-9456
...
[MIRROR] Makes bonfires last longer!
2020-12-13 22:55:54 -05:00
f852e53f88
Merge pull request #9456 from Very-Soft/longer-bonfires
...
Makes bonfires last longer!
2020-12-14 03:17:47 +00: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
ae92942bde
Abductor Ship
2020-12-08 18:56:09 +00:00
0cb47f9a19
Merge pull request #980 from CHOMPStationBot/upstream-merge-9422
...
[MIRROR] [MIRROR] Plainleather & Tobacco
2020-12-08 03:14:03 -05:00
cb9a5dfd8f
Merge pull request #979 from CHOMPStationBot/upstream-merge-9427
...
[MIRROR] [MIRROR] Modular honks
2020-12-08 03:12:14 -05:00
d452144e20
Merge pull request #965 from CHOMPStationBot/upstream-merge-9393
...
[MIRROR] [MIRROR] Stowaway Cryopod is now invisible, and incorporeal.
2020-12-08 02:59:52 -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
56a9dbf677
Merge pull request #9393 from VOREStation/upstream-merge-7749
...
[MIRROR] Stowaway Cryopod is now invisible, and incorporeal.
2020-12-05 01:57:11 +00:00
ef7a8f2cda
Merge pull request #9402 from Very-Soft/dauntless
...
ITG Dauntless
2020-12-03 23:35:54 +00:00
6df859e88e
Merge pull request #915 from Shadow-Quill/PDTurrets
...
Adds Point Defence Turrets
2020-12-02 15:54:47 -07:00
bbdeeede74
Merge pull request #954 from cadyn/newportals
...
Some simple portals for kassc
2020-11-30 23:58:33 -07:00
e1d970908f
Appease travis' replacement
2020-11-30 16:39:12 -08:00
9521b59193
Kassc portals :)
2020-11-30 16:24:46 -08: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
7fd1eaa5ec
Merge pull request #894 from CHOMPStation2/Razgriz1032-patch-3
...
Remove Loss Poster
2020-11-22 04:11:48 -05:00
e56a6c7382
Remove Loss Poster
...
Fixes #892
2020-11-22 01:48:15 -07:00
9d660c4222
Merge pull request #1 from CHOMPStation2/master
...
merge master into branch
2020-11-21 21:24:20 -05:00
ca04b0ef72
Make the station gateway work :p
2020-11-21 13:24:49 -08:00
a7623eacc6
Merge pull request #9310 from Jwguy/MinorAdditions
...
PosterAdds
2020-11-19 01:27:54 +00: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
Nadyr