cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
78,752 Commits 5 Branches 0 Tags
ab154b48b21445834aa64b51d59396be6efe229b
Commit Graph

1759 Commits

Author SHA1 Message Date
Casey
386bb64824 Merge pull request #13264 from Very-Soft/fairylights 
Fairy lights
 2022-07-03 20:00:24 +00:00
Casey
92d8d0f432 Merge pull request #13254 from Heroman3003/smesfix 
Fixes smes not connecting to powernet on construction
 2022-07-03 09:08:15 +00:00
Casey
84e6bfd922 Makes all things that check for dorms check for forbid events var 2022-06-30 22:59:57 +00:00
Casey
928a321b5f TGUI Input Conversions 2022-06-19 03:59:14 +00:00
Razgriz
975d04c425 Update cell.dm 2022-05-18 14:35:07 -07:00
Razgriz
d2927f4083 Update cell.dm 2022-05-18 14:00:56 -07:00
Razgriz
7e26f9d1a1 Restore power cell sprite to "V2" and add cells to protolathe 
-Restored power cell sprites to the "V2" sprites as I called them.
-Disabled base and virgo power cell/device/power_cell_research files and moved them into chomp modularity folder instead.

Added to the protolathe (I hope because I forgot to last time):
-Giga device cells
-Giga large cells
-Rechargeable weapon cell
-EMP-proof device cell
-EMP-proof weapon device cell
-Potato device cell


All the giga and recharging cells will require precursor tech 1.
 2022-05-18 00:28:31 -07:00
Novacat
e785bde04a Merge pull request #12821 from Very-Soft/solartweak 
Solar Tweak!
 2022-04-24 23:34:01 +00:00
Nadyr
6ba9806786 Merge pull request #4119 from CHOMPStation2/upstream-merge-12790 
[MIRROR] re-EnerGen Batteries
 2022-04-18 22:47:12 -04:00
Nadyr
ba220d82d2 powder that makes you say yes 2022-04-18 22:30:54 -04:00
Casey
cd9e4ab745 re-EnerGen Batteries 2022-04-18 20:48:14 +00:00
Casey
aa55b345c2 Merge pull request #12775 from GhostActual/random_fixes 
New stock part sprites
 2022-04-18 20:45:59 +00:00
Nadyr
ae1ac229d4 powder that makes you say yes 2022-04-17 23:37:32 -04:00
Casey
66853c1f0f EnerGen Brand Batteries 2022-04-17 21:17:09 +00:00
Rykka
0e3b6a9ba9 Forgot about self-charging cells, oops. 2022-04-10 09:04:18 -06:00
Razgriz
8285fba939 Merge pull request #4007 from Raeschen/lights 
Adds a light painter device, adds to Autolathe.
 2022-04-07 00:51:10 -07:00
Casey
535316338b Merge pull request #12650 from FartMaster69420/rteg-rped 
RPEDs for RTEGs and Rotory Generators
 2022-04-06 00:16:04 +00:00
Nadyr
668750e503 Merge branch 'master' into upstream-merge-12633 2022-04-04 19:12:58 -04:00
Raeschen
2ff4088bd3 Adds a light painter device, adds to Autolathe. 
Creates a Light Painter device.
Use the device to assign a color. Use again to reset to default color. Click on any light fixture to apply.

Simple.
 2022-04-04 23:45:55 +02:00
Casey
a11213692e GB Update 2022-04-04 17:48:08 +00:00
Casey
cf0f70593e More maptweaks! 2022-04-03 21:19:21 +00:00
Casey
795f5da955 Merge pull request #12501 from Very-Soft/reg 
I forgot to remove the debug logging on reg
 2022-03-21 10:09:55 +00:00
Casey
807bd35e67 Merge pull request #12452 from Very-Soft/wheel 
D-Type REG engine
 2022-03-19 04:38:50 +00:00
Nadyr
077081fa26 Merge pull request #3263 from CHOMPStation2/upstream-merge-11972 
[MIRROR] Makes buildable smes refresh coils on construction
 2021-12-12 06:39:45 -05:00
Casey
f86e3f2b88 Adds two new particle smasher recipies 2021-12-12 05:52:49 -05:00
Casey
9163ddb85b Renames Engineer, new alt-titles for Stellar Delight 2021-12-12 08:46:53 +00:00
Casey
b39047e3f5 Merge pull request #11972 from Heroman3003/smesfix 
Makes buildable smes refresh coils on construction
 2021-12-06 03:22:16 +00:00
Nadyr
4f36828e4c Merge pull request #3156 from CHOMPStationBot/upstream-merge-11615 
[MIRROR] [MIRROR] Remove suicide act
 2021-10-27 21:05:48 -04:00
Aronai Sieyes
0f2f5cb482 Merge pull request #11615 from VOREStation/upstream-merge-8311 
[MIRROR] Remove suicide act
 2021-10-28 00:49:05 +00:00
Nadyr
b441ed93f5 powder that makes you say yes 2021-10-27 19:17:19 -04:00
Chompstation Bot
318ac12a29 ports citrp's KAs, which are a port of citmain's KAs, which are tg's, because i like KAs 2021-10-27 16:05:04 +00:00
Razgriz
362caffe59 Merge pull request #2798 from Rykka-Stormheart/shep-dev-compile-errors 
Misc DMLang/VSCode Compiler Fixes + Some Actual Compiler Fixes
 2021-09-17 03:15:52 -07:00
Razgriz
3e237fbfc5 Change energy cell sprites and add new giga cell 
Changes super and hyper cells to utilized some new and unused sprites. Adds a new energy cell past the hyper cell to also take advantage of new sprites. Requires precursor tech 1 and power tech 5
 2021-09-12 23:39:16 -07:00
Rykka
0d5efb3d70 Fix items attempting to directly access/touch amount on stack var. 
PR https://github.com/VOREStation/VOREStation/pull/11454 set var amount on stacks to private, necessitating using get_amount() to read the amount currently left in a stack, rather than just directly accessing the var.
 2021-09-03 18:26:32 -07:00
Chompstation Bot
af0d7a0f6b Make stack amount var private 2021-08-26 15:39:04 +00:00
Nadyr
f19dc1b2eb Merge pull request #2874 from cadyn/upstream-merge-11421 
Merge Upstream Pull Request 11421
 2021-08-25 22:38:53 -04:00
Aronai Sieyes
72f5e790db Upstream-11421 2021-08-24 21:10:20 -07:00
Aronai Sieyes
6eb1da72db Upstream-11412 2021-08-24 21:09:52 -07:00
Aronai Sieyes
edda5a3198 Merge pull request #11328 from VOREStation/Icons/fieldgen 
Skyrat field generator sprites
 2021-08-05 20:31:02 +00:00
Aronai Sieyes
b61deb18d8 Merge pull request #11318 from VOREStation/upstream-merge-8186 
[MIRROR] Cell Rack Update
 2021-08-01 14:27:40 +00:00
Chompstation Bot
7714b9c393 Angled wall bits 'n bobs 2021-07-23 22:51:32 +00:00
Aronai Sieyes
279f027dca Merge pull request #11202 from VOREStation/vplk-optimize-machines 
Optimize machinery processing
 2021-07-22 16:29:58 +00:00
Aronai Sieyes
de8b9588e4 Merge pull request #11195 from VOREStation/Arokha/emsprit 
Fix emitter starting sprites
 2021-07-21 14:14:04 +00:00
Chompstation Bot
15cafbe65b Optimize a couple things 2021-07-20 21:30:20 +00:00
Novacat
0bcc9b42e7 Merge pull request #11132 from VOREStation/Fixes/11129 
Fixes #11129
 2021-07-18 19:14:51 +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
Chompstation Bot
9acb3a208e Removes unnecessary, unused, and redundant helpers. 2021-07-14 17:57:22 +00:00
Nadyr
21d2214bb3 powder that makes you say yes 2021-07-09 21:51:59 -04:00