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
Chompstation Bot
287a5deee3
Use material defines more
2021-07-07 19:02:05 +00:00
Nadyr
f2fe7aa004
powder that makes you say yes
2021-07-05 18:28:35 -04:00
Chompstation Bot
14129d60cf
Converts visible_message notice spans to look more like emotes
2021-07-05 20:30:12 +00:00
Aronai Sieyes
fdf4e56451
Merge pull request #10862 from VOREStation/Icons/moredeco
...
More decorations, fancy suit dispenser, angry generator
2021-07-04 04:29:52 +00:00
Nadyr
7478f94c49
powder that makes you say yes
2021-07-03 22:05:44 -04:00
Nadyr
4ce0d8397c
powder that makes you say yes
2021-07-03 21:59:07 -04:00
Chompstation Bot
c31b28755f
Replace cells with Eris cells
2021-07-04 01:53:41 +00:00
Razgriz
04317096ff
Merge pull request #2368 from CHOMPStationBot/upstream-merge-10831
...
[MIRROR] Further Map Changes
2021-07-03 16:50:15 -07:00
Razgriz
267b2d40cc
Merge pull request #2350 from CHOMPStationBot/upstream-merge-10804
...
[MIRROR] Port Eris stock parts icons
2021-07-03 14:37:51 -07:00
Chompstation Bot
ea9582b5b1
Further Map Changes
2021-07-03 21:15:08 +00:00
Aronai Sieyes
6072dc7915
Merge pull request #10804 from VOREStation/Icons/stockparts
...
Port Eris stock parts icons
2021-07-03 20:32:35 +00:00
Chompstation Bot
8cb3b198bd
Port /tg/ supermatter sprite
2021-07-03 20:32:29 +00:00
Razgriz
e3a9cd3775
Merge branch 'master' into upstream-merge-10764
2021-07-03 00:26:13 -07:00
Chompstation Bot
bf04ca9003
Port /tg/ vis_contents openspace
2021-06-30 19:49:25 +00:00
Chompstation Bot
b6e1989a01
The One Where I Port Modals
2021-06-30 19:29:34 +00:00
Chompstation Bot
ad122fdd96
Rewrite RCON UI
2021-06-25 21:53:58 -04:00
Razgriz
93794b2148
Merge pull request #2270 from CHOMPStationBot/upstream-merge-10719
...
[MIRROR] [MIRROR] Linter diagnostics + bans non-var relative pathing
2021-06-25 00:17:19 -07:00
Nadyr
ee2a4bbc77
Merge pull request #2268 from CHOMPStationBot/upstream-merge-10610
...
[MIRROR] Makes machinery destroyable by projectiles
2021-06-23 19:09:41 -04:00
Chompstation Bot
fb343cec6c
[MIRROR] Linter diagnostics + bans non-var relative pathing
2021-06-22 22:17:02 +00:00
Razgriz
968067d0e7
Merge pull request #2267 from CHOMPStationBot/upstream-merge-10725
...
[MIRROR] Maybe fixes heroman's complaint
2021-06-21 22:15:33 -07:00
Chompstation Bot
44a23181e6
Makes machinery destroyable by projectiles
2021-06-22 02:48:57 +00:00
Novacat
93cab8e8c6
Merge pull request #10725 from VOREStation/Arokha/lightmaybe
...
Maybe fixes heroman's complaint
2021-06-22 02:23:25 +00:00
Aronai Sieyes
a4027d273d
Merge pull request #10608 from VOREStation/Arokha/emittersprites
...
Port emitter sprites
2021-06-21 15:07:43 +00:00
Novacat
f2d035cec0
Merge pull request #10711 from Hatterhat/wasted-waste
...
timers and whatnot are printable now, actually
2021-06-20 14:11:19 +00:00
Chompstation Bot
55e3dc7904
Port current /tg/ lighting system
2021-06-18 04:23:09 +00:00
Aronai Sieyes
bf55685866
Merge pull request #10533 from VOREStation/Fixes/10465
...
Fixes #10465
2021-06-02 16:01:23 +00:00
Chompstation Bot
eb03a53185
Ports musical instruments from /tg/
2021-06-01 20:29:51 +00:00
