Commit Graph

1680 Commits

Author SHA1 Message Date
Verkister
fa285f457a Fixes grid check announcement
I'm quite sure that neither centcom nor sif infrastructure are affected by the event occuring on the station.
2022-12-06 15:35:02 +02:00
Nadyr
69d6ad3bb7 Merge pull request #5107 from CHOMPStation2/upstream-merge-13860
[MIRROR] Gird check fixes
2022-10-11 20:13:36 -04:00
Casey
f19cbeed71 Merge pull request #13860 from Heroman3003/grid-check-fixes
Gird check fixes
2022-10-10 03:03:38 +00:00
Casey
86ee514421 Merge pull request #13855 from Cameron653/overlay_madness
Upgrades OverlaySS. Fixes #3627
2022-10-10 03:02:27 +00:00
Casey
d8b03336e5 Sanitization 2022-10-02 17:58:34 +00:00
Casey
0727c30768 Merge pull request #13777 from Heroman3003/teleport-runtime
Fixes teleport artifact not unbuckling mobs properly
2022-09-23 00:57:47 +00:00
Casey
2fbd18b67c Merge pull request #13681 from Heroman3003/few-things-aaa
Fixes a few minor things
2022-09-10 20:35:43 +00:00
Nadyr
7276d043c7 Merge pull request #4863 from CHOMPStation2/upstream-merge-13671
[MIRROR] More light updates!
2022-09-07 16:10:31 -04:00
Casey
ceca2956e1 Merge pull request #13671 from Cameron653/light_overlay
More light updates!
2022-09-06 19:44:48 +00:00
Casey
c34eb89e54 Merge pull request #13663 from Heroman3003/paruntime
Fixes runtime with self-shutoff of PA
2022-09-06 19:36:59 +00:00
Nadyr
a06f70b32b Merge pull request #4845 from CHOMPStation2/upstream-merge-13660
[MIRROR] Bugfix Palooza
2022-09-04 18:40:29 -04:00
Nadyr
33581397f3 powder that makes you say yes 2022-09-04 18:20:07 -04:00
Casey
26e255fd34 Merge pull request #13659 from Cameron653/LIGHT_MODIFICATION
Allows light manipulation via multitool.
2022-09-04 21:51:33 +00:00
Casey
6d970b9e9c Bugfix Palooza 2022-09-04 21:51:29 +00:00
Novacat
c09320ccc9 Merge pull request #13590 from Novacat/nova-basicfixes
Fixes breaker boxes not initializing
2022-08-27 03:12:53 +00:00
Casey
95158e98ce Merge pull request #13332 from Heroman3003/teslamove
Separates Forbids Events from Forbids Singulo
2022-07-15 22:33:32 +00:00
Razgriz
bc41c8c2dc Merge branch 'master' into upstream-merge-13267 2022-07-03 17:22:19 -07:00
Razgriz
bb88a04785 powder that makes you say yes 2022-07-03 17:21:24 -07:00
Razgriz
9182699a95 Merge pull request #4496 from CHOMPStation2/upstream-merge-13264
[MIRROR] Fairy lights
2022-07-03 17:19:23 -07:00
Razgriz
00011f99c2 Merge pull request #4484 from CHOMPStation2/upstream-merge-13254
[MIRROR] Fixes smes not connecting to powernet on construction
2022-07-03 17:15:22 -07:00
Casey
3eda7b5ba6 That nice glow 2022-07-03 23:56:32 +00:00
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