cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
57,538 Commits 9 Branches 0 Tags
6bb324fd55df3578060ff78ba75c5512c991170a
Commit Graph

40356 Commits

Author SHA1 Message Date
Razgriz
6bb324fd55 fix comment compile error 2020-07-13 03:08:46 -07:00
Razgriz
873371c41e Fixes roller beds and Pursuit RIG sprites 2020-07-13 01:31:05 -07:00
Razgriz
02421b075e Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull 2020-07-12 16:14:45 -07:00
SplinterGP
b3721ab15d Merge remote-tracking branch 'Yawn-wider/master' into holdelta 2020-07-06 21:12:45 -03:00
SplinterGP
c7942a1d86 FIXES COOPER!!!!!!!1111!!1!!11!!!! 2020-07-06 21:12:25 -03:00
Repede
270831bf92 Merge branch 'master' into xionalt 2020-07-06 19:23:15 -04:00
Repede
baaf131730 Alt pattern for the xion outfit: named xion (yw alt) - Spritefix by whiteout 2020-07-06 19:22:22 -04:00
SplinterGP
d01a0d207a Merge remote-tracking branch 'Yawn-wider/master' into holdelta 2020-07-06 17:25:42 -03:00
SplinterGP
a056658ef6 Tesh fluffies 2020-07-06 16:58:15 -03:00
izac112
01a20369ee Merge branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore into izac 2020-07-06 15:39:21 +02:00
izac112
d9af2a4cca updates client procs.dm 2020-07-06 15:38:55 +02:00
Razgriz
a47b909aa9 Update deathclaw.dm 2020-07-05 20:01:08 -07:00
Izac Joof Forsgren
2214949d79 Merge branch 'master' into izac 2020-07-05 22:38:39 +02:00
lukevale
8bebad0ead Jean's chocolate box 
Time for her to money shot with dat girl scout chocolates
 2020-07-05 09:22:21 -05:00
lukevale
4c9cd195e4 Adds in cyber dragon wings. 2020-07-05 02:40:55 -05:00
izac112
4b55c8b507 Preparations for tgs 4 (does not actually change anything for current tgs version) 2020-07-04 23:37:42 +02:00
Luke Vale
aae26a2b54 more screaming 2020-07-04 04:03:19 -05:00
Izac Joof Forsgren
cf891ce999 Update code/game/objects/items/stacks/tiles/tile_types.dm 2020-07-04 08:26:15 +02:00
Luke Vale
8221cbc4ad Adds in the files because I'm a dummy 2020-07-04 01:25:23 -05:00
Luke Vale
2098a55ae7 Adds in the other carpet types as a buyable crate. 2020-07-04 01:18:26 -05:00
SplinterGP
28b5e2b143 tesh markings 2020-07-04 02:19:25 -03:00
Repede
13b7aeb4a5 https://github.com/CHOMPStation2/CHOMPStation2/pull/207 2020-07-03 16:56:42 -04:00
Repede
a9993021f7 Merge branch 'master' into lumber 2020-07-02 23:54:44 -04:00
Repede
6a38c309af Makes wood logs worth points (lumbering time) 2020-07-02 23:54:09 -04:00
Repede
c6e5eac570 adds missing comment 2020-07-02 23:17:51 -04:00
Repede
67dbc1a34b fix 2020-07-02 23:16:31 -04:00
Repede
a5fcaeac5f fixes boozehound not being selectable 2020-07-02 23:08:26 -04:00
izac112
22880f526d Voreupdate 2020-07-02 15:39:00 +02:00
Sarmenti Campbell
603987e52b Added Miss M 
Idk.
 2020-06-28 23:10:49 +02:00
SplinterGP
ab4f960598 Merge branch 'master' into master 2020-06-27 15:39:46 -03:00
SplinterGP
bfda1018c1 fixes runtime(hopefully) on slime on using oculusosone 2020-06-27 12:29:33 -03:00
SplinterGP
fea9f5397f sprite back to the snow be white like it should be 2020-06-27 11:23:32 -03:00
SplinterGP
8df8820edf Begone pink triangles 2020-06-27 04:55:31 -03:00
Razgriz
400843be87 Update chat_commands for debug purposes 2020-06-25 19:03:38 -07:00
Leshana
0a461a507b Fix sector initialization stack overflow crash. 
- Replace changes from 8c7371c5d4b900308cecdba5335989e8c9f191fe
    - Removed debugging prints in skybox generation
    - Reverted change to GetConnnectedZLevels to avoid the chicken-or-egg initialization issue of find_z_levels() requiring knowledge of a sector's z-levels during the attempt to determine a sector's z-levels.
    - Make find_z_levels() always called again so that lazy open space initialization works on landable ships again.
- Instead, allow static configuration of sector map_z to override the default behavior of calling GetConnectedZLevels()
 2020-06-25 11:10:02 -04:00
Atermonera
ebe7bd1975 Enables overmap on SC, adds Sif to SC skybox (#6954) 
* Enables overmap on SC, adds wip Sif to SC skybox

* codersprites
 2020-06-25 11:10:02 -04:00
Novacat
730e5899ce Merge pull request #8324 from VOREStation/upstream-merge-7273 
[MIRROR] Observing improvements
 2020-06-25 02:19:07 -04:00
Leshana
b14b32873f Merge pull request #8326 from VOREStation/vplk-vgs-management 
Support actual VGS environment management.
 2020-06-24 11:38:34 -04:00
Atermonera
736fdab6e3 Merge pull request #7273 from Cyantime/obs 
Observing improvements
 2020-06-24 11:36:18 -04:00
SplinterGP
2424a9f6d7 More autolathe fixes and icon stuff 2020-06-23 22:01:48 -03:00
SplinterGP
bc5d25c208 autolathe fixes 2020-06-22 22:55:58 -03:00
Leshana
b55fb8f2d4 Support actual VGS environment management. 
- Extends VGS DMAPI to include Reboot and Init Complete messages.
- Add pid file and symlinked datafolder to git ignore.
 2020-06-22 16:08:45 -04:00
Atermonera
ad540c6e05 Merge pull request #7298 from TheFurryFeline/TFF-Solar_Storm_Typo_Fixy 
Hoorah. More Typo Fixy
 2020-06-22 15:16:48 -04:00
Novacat
f7cab660e8 Merge pull request #8321 from VOREStation/upstream-merge-7297 
[MIRROR] Wrist-bound PDAs!
 2020-06-22 09:39:41 -04:00
Novacat
0ff5bccb01 Merge pull request #8318 from VOREStation/upstream-merge-7295 
[MIRROR] Dirt Fix
 2020-06-22 09:39:24 -04:00
Novacat
e36649f18e Merge pull request #8315 from H0lySquirr3l/master 
Nickcrazy Fluff uniform application
 2020-06-22 07:58:36 -04:00
Novacat
73d9e4a248 Merge pull request #8313 from KasparoVy/look-how-you-murdered-my-birb 
Makes Nevrean use Sergal Void & RIG Suit Sprites
 2020-06-22 07:55:02 -04:00
Novacat
8140d01085 Merge pull request #8320 from VOREStation/Verkister-patch-1 
un-earrapifies instruments (upstream early access)
 2020-06-22 07:54:03 -04:00
Novacat
70d21b6b79 Update dirt.dm 2020-06-22 07:52:45 -04:00
Novacat
f861bd8b22 Merge pull request #8317 from VOREStation/upstream-merge-7296 
[MIRROR] Fixes heater examining
 2020-06-22 07:52:10 -04:00