cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
66,205 Commits 6 Branches 0 Tags
72f5e790db6f994d4fdba109e1b9616f7e3f9f98
Commit Graph

133 Commits

Author SHA1 Message Date
Nadyr
3a7dd9f4b0 Merge branch 'master' into upstream-merge-11375 2021-08-09 19:11:26 -04:00
Nadyr
b32d433da4 Merge branch 'master' into upstream-merge-11373 2021-08-09 18:49:12 -04:00
Chompstation Bot
bc797521bb Ship eating skybox and emotes tweak 2021-08-09 05:06:56 +00:00
Chompstation Bot
5ec68fc911 Forgot DME change for ship eating 2021-08-09 03:42:25 +00:00
Aronai Sieyes
185dc898f4 Merge pull request #11370 from VOREStation/Arokha/shipnom 
Allows you to eat spaceships
 2021-08-09 03:28:52 +00:00
Razgriz
40278c3bcd Merge pull request #2741 from CHOMPStationBot/upstream-merge-11341 
[MIRROR] Fancy sprited shuttles
 2021-08-07 15:13:48 -07:00
Chompstation Bot
2967ef4416 Fancy sprited shuttles 2021-08-06 22:15:49 +00:00
Aronai Sieyes
8cfb426ef7 Merge pull request #11342 from VOREStation/Arokha/connectedfancycomps 
Skyrat connected consoles
 2021-08-06 21:47:09 +00:00
Aronai Sieyes
043dc972a5 Merge pull request #11297 from VOREStation/Arokha/skyboxtrans 
Overmap has smol skybox transparency
 2021-08-01 14:46:43 +00:00
Aronai Sieyes
509586d6e9 Merge pull request #11235 from VOREStation/Fixes/11223 
Fixes #11223
 2021-07-25 21:46:57 +00:00
Chompstation Bot
15cafbe65b Optimize a couple things 2021-07-20 21:30:20 +00:00
Chompstation Bot
481c0e314e Convert some bools to TRUE/FALSE instead of 1/0. 2021-07-16 17:44:40 +00:00
Chompstation Bot
d9cb00a124 Add skybox planet sprite for Virgo3b, modify midpoint 2021-07-10 23:48:50 +00:00
Aronai Sieyes
bffb395897 Merge pull request #10990 from VOREStation/Arokha/dis 
Show proper original name on 'un-revealed' ships
 2021-07-09 16:17:54 +00:00
Aronai Sieyes
afd142bd6a Merge pull request #10945 from VOREStation/Arokha/fixes333 
4 fixes
 2021-07-07 19:04:22 +00:00
Chompstation Bot
14129d60cf Converts visible_message notice spans to look more like emotes 2021-07-05 20:30:12 +00:00
Chompstation Bot
877b582a85 Replace all the overmap icons 2021-07-03 20:34:03 +00:00
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
Nadyr
384f936937 Merge pull request #2292 from CHOMPStationBot/upstream-merge-10754 
[MIRROR] 2 Overmap Fixes
 2021-06-25 22:07:02 -04:00
Novacat
9dcda80a06 Merge pull request #10754 from VOREStation/Arokha/shiplight 
2 Overmap Fixes
 2021-06-25 18:26:05 +00:00
Chompstation Bot
fb343cec6c [MIRROR] Linter diagnostics + bans non-var relative pathing 2021-06-22 22:17:02 +00:00
Chompstation Bot
55e3dc7904 Port current /tg/ lighting system 2021-06-18 04:23:09 +00:00
Chompstation Bot
f32683b3cb Add distress beacons to overmap ships/visitables 2021-06-10 02:18:55 +00:00
Chompstation Bot
78acd45edc Remove extra asterisks from rune audible messages 2021-05-31 17:26:54 +00:00
Chompstation Bot
4476e4104d Ports Runechat 2021-05-30 22:51:20 +00:00
Nadyr
ce20d09e0c Merge pull request #2054 from CHOMPStationBot/upstream-merge-10433 
[MIRROR] [MIRROR] Linter Introduction + Cleanup
 2021-05-27 21:35:05 -04:00
Chompstation Bot
20e3b0a2d3 [MIRROR] Linter Introduction + Cleanup 2021-05-27 16:31:50 +00:00
Aronai Sieyes
62a3be76a9 Merge pull request #10432 from Very-Soft/ionengineuwu 
New Ion engine sprite
 2021-05-27 01:10:14 +00:00
Chompstation Bot
5af77e4b11 Maybe make deepspace levels slightly more robust? 2021-05-25 21:32:11 +00:00
Novacat
3f99fb32f1 Merge pull request #10047 from Novacat/nova-ert 
Properly garbage collects carp
 2021-03-30 20:04:32 +00:00
Chompstation Bot
ad57e1ad13 [MIRROR] Sideports a couple of init unit tests from Neb. 2021-02-27 18:45:36 +00:00
Chompstation Bot
37031c2c9b Shuttle control panel (rebundled) 2021-02-14 08:29:32 -05:00
Novacat
3d5c11d6df Merge pull request #9629 from Novacat/nova-basicfixes 
Shuttle Console ID Stuff
 2021-02-01 03:25:27 +00:00
Chompstation Bot
ae92942bde Abductor Ship 2020-12-08 18:56:09 +00:00
Novacat
46a3ef1d35 Merge pull request #9424 from VOREStation/upstream-merge-7773 
[MIRROR] Fixes unreachable landmarks breaking spacetravel
 2020-12-08 03:35:06 +00:00
Verkister
9848c0e719 Merge pull request #9225 from VOREStation/upstream-merge-7708 
[MIRROR] Makes wall-mounted machines layer above windows
 2020-10-27 08:16:29 +00:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
Atermonera
c421782aa2 Mobs don't get lost in space (#7713) 2020-10-02 21:24:00 -04:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
Novacat
d49640431d Merge pull request #9062 from ShadowLarkens/tgui_finale 
NanoUI Goes To Brazil
 2020-09-21 14:13:16 -04:00
ShadowLarkens
3f191e4204 NanoUI Goes To Brazil 2020-09-20 02:36:46 -07:00
Atermonera
aad674c2a7 Merge pull request #7628 from KillianKirilenko/kk-misc3 
[MAPPING] Fuel Port Subtypes
 2020-09-19 21:55:34 -04:00
Novacat
77f39209a1 Merge pull request #8947 from VOREStation/upstream-merge-7593 
[MIRROR] Increases number of things that survive overmap ztransit
 2020-09-01 00:52:36 -04:00
Novacat
68f64d3d84 Update ship.dm 2020-08-31 23:53:59 -04:00
Atermonera
aa1575c27f Merge pull request #7593 from Cyantime/patch-3 
Increases number of things that survive overmap ztransit
 2020-08-31 23:41:07 -04:00
Cyantime
6d5c14c448 Stops meson/etc use with overmap consoles 2020-08-31 23:39:49 -04:00
Rykka
d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
Erik
61eca990df Prep for overmap 
A couple variable changes to allow overmap shuttles to function properly and for the overmap to be more than just empty space.
 2020-08-20 15:47:31 -07:00
ShadowLarkens
48b630891e TGUI Overmap Shuttle Controls 2020-08-18 20:42:12 -07:00
ShadowLarkens
1ff5627f47 TGUI Shuttle Consoles 2020-08-16 22:27:09 -07:00