cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
66,285 Commits 8 Branches 0 Tags
c7a71bc5996fe35236c6910c1893aae66b1a2460
Commit Graph

970 Commits

Author SHA1 Message Date
Aronai Sieyes
72f5e790db Upstream-11421 2021-08-24 21:10:20 -07:00
Nadyr
c1256426da Merge branch 'master' into upstream-merge-11324 2021-08-01 17:49:14 -04:00
Nadyr
b942e02a7b powder that makes you say yes 2021-08-01 17:30:48 -04:00
Chompstation Bot
0857ab35f3 Few more outdoors fixes 2021-08-01 16:26:38 +00:00
Chompstation Bot
21b6022a3a [MIRROR] Adds optional area-based definition for outdoors-ness 2021-08-01 15:41:46 +00:00
Nadyr
5c7226fa54 Merge branch 'master' into upstream-merge-11110 2021-07-16 19:09:43 -04:00
Chompstation Bot
d0d23ed393 Fixes a bunch of bools missed in #11100 2021-07-16 21:12:20 +00:00
Chompstation Bot
481c0e314e Convert some bools to TRUE/FALSE instead of 1/0. 2021-07-16 17:44:40 +00:00
Nadyr
627bc202a1 powder that makes you say yes 2021-07-09 21:47:50 -04:00
Chompstation Bot
287a5deee3 Use material defines more 2021-07-07 19:02:05 +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
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
Razgriz
d6546318c5 Update mecha_construction_paths_vr.dm 2021-06-24 18:36:59 -07:00
Chompstation Bot
fb343cec6c [MIRROR] Linter diagnostics + bans non-var relative pathing 2021-06-22 22:17:02 +00:00
Nadyr
c75144c9c2 powder that makes you say yes 2021-06-19 21:55:06 -04:00
Chompstation Bot
42cdb33edb [MIRROR] Removes Global Iterators 2021-06-19 13:43:53 +00:00
Chompstation Bot
55e3dc7904 Port current /tg/ lighting system 2021-06-18 04:23:09 +00:00
Novacat
00fbf2b6ed Merge pull request #10642 from VOREStation/upstream-merge-8125 
[MIRROR] ripleys autoscoop ore in an aoe
 2021-06-14 11:58:49 +00:00
Nadyr
92e1743b5c Merge branch 'master' into upstream-merge-10401 2021-05-27 22:40:15 -04:00
Chompstation Bot
d76e756e5f [MIRROR] Reverts recipe changes from Industrial Expansion 2021-05-27 17:17:01 +00:00
Chompstation Bot
20e3b0a2d3 [MIRROR] Linter Introduction + Cleanup 2021-05-27 16:31:50 +00:00
Aronai Sieyes
2d4853ca4f Merge pull request #10310 from Novacat/nova-pathfinder 
Mecha Balance and Fighter Fixes
 2021-05-15 17:17:36 +00:00
Nadyr
8019cd3421 Merge pull request #1386 from CHOMPStationBot/upstream-merge-9445 
[MIRROR] [MIRROR] Department and Round Goals
 2021-03-30 03:46:36 -04:00
Chompstation Bot
b7b8682e7c [MIRROR] Added think-tanks. 2021-03-18 14:57:26 +00:00
Nadyr
b9b094eed0 Merge pull request #1576 from CHOMPStationBot/upstream-merge-9909 
[MIRROR] Fixes fighters being so slow
 2021-03-12 01:56:09 -05:00
Nadyr
57b6444745 Merge pull request #1568 from CHOMPStationBot/upstream-merge-9904 
[MIRROR] Updates the _vr recipies to include copper
 2021-03-12 01:10:27 -05:00
Novacat
a2e3140cb6 Merge pull request #9909 from Novacat/nova-basicfixes 
Fixes fighters being so slow
 2021-03-11 14:48:38 +00:00
Razgriz
401784f3e8 Merge branch 'master' into upstream-merge-9445 2021-03-10 17:59:32 -07:00
Chompstation Bot
d2e828454f Updates the _vr recipies to include copper 2021-03-10 20:46:03 +00:00
Novacat
b6d583cbab Merge pull request #9895 from Novacat/nova-basicfixes 
Fixes Industrial Expansion
 2021-03-10 19:27:55 +00:00
Razgriz
0c7095b11f Update mecha.dm 2021-03-08 20:01:42 -07:00
Chompstation Bot
ad57e1ad13 [MIRROR] Sideports a couple of init unit tests from Neb. 2021-02-27 18:45:36 +00:00
Novacat
e27799eba2 Merge pull request #9445 from VOREStation/upstream-merge-7369 
[MIRROR] Department and Round Goals
 2021-02-21 22:15:39 +00:00
cadyn
6e569ca7de Merge pull request #1209 from MisterGrimm/GammaJamma 
Adds the GA-X Experimental Gamma Laser for mechs
 2021-02-03 13:16:02 -08:00
Sym
55a6523bc0 Adds Gamma Laser for mech, tweaks gamma laser 
Tweaking Gamma Laser projectile to be used in mech weapon
 2021-01-29 15:04:36 -05:00
Novacat
a4c4d371db Merge pull request #9604 from VOREStation/upstream-merge-7818 
[MIRROR] Mech Appearance Update
 2021-01-25 00:51:12 +00:00
Razgriz
ea80be587b Merge pull request #750 from MisterGrimm/GoodbyeMicromechs 
Commenting out micro mech stuff
 2021-01-08 15:20:57 -07:00
Novacat
cabb515fae Merge pull request #9498 from VOREStation/upstream-merge-7787 
[MIRROR] Powered Exosuit Running Board (from /vg/station)
 2020-12-23 14:16:45 +00:00
Novacat
49ef2d2ee9 Merge pull request #8848 from Cyantime/spaceweirdness 
Remove gravity from debris field and rogue mining zones
 2020-11-14 06:49:05 +00:00
Sym
49d70a6f42 Makes micro equipment more obvious 
Because this is desperately needed.
 2020-10-24 10:49:31 -04:00
Sym
1173ddf675 Remove micro mech stuff 
Time to take out the trash.
 2020-10-23 20:17:07 -04:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
ShadowLarkens
3d7b051f2b Convert /material to /datum/material 2020-09-27 16:16:44 -07:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
Atermonera
03f7a2ad58 Merge pull request #7630 from Mechoid/ExoEncumberence 
Exo Encumberence
 2020-09-24 01:57:48 -04:00
ShadowLarkens
3f191e4204 NanoUI Goes To Brazil 2020-09-20 02:36:46 -07:00
izac112
4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
Kates
21b8fedb3f Allow mechs to butcher things with their drill. (#7493) 
* Allow mechs to butcher things with their drill.
- Vague copy of a TG feature, made difficult by their different code. Still, it works.

* Add changelog
 2020-09-06 14:19:24 -04:00
Novacat
ec19058d14 Merge pull request #8982 from VOREStation/upstream-merge-7615 
[MIRROR] Fix mech weapons breaking on self-deleting mobs
 2020-09-05 12:35:47 -04:00
Novacat
af2e6a8b8b Merge pull request #8977 from VOREStation/upstream-merge-7619 
[MIRROR] Mech file typo. Mostly capitals.
 2020-09-05 12:23:59 -04:00