Commit Graph

30164 Commits

Author SHA1 Message Date
Nadyr
3ca4336586 Merge pull request #2464 from CHOMPStationBot/upstream-merge-10970
[MIRROR] Fixes #10967
2021-07-09 23:47:40 -04:00
Nadyr
cf3eb9f54b Merge pull request #2462 from CHOMPStationBot/upstream-merge-10961
[MIRROR] Bleed outdoor light onto walls and such
2021-07-09 23:45:15 -04:00
Nadyr
2cad763c26 Merge pull request #2447 from CHOMPStationBot/upstream-merge-10852
[MIRROR] Use material defines more
2021-07-09 23:22:03 -04:00
Nadyr
fcac8b3cd1 powder that makes you say yes 2021-07-09 23:05:19 -04:00
Nadyr
b8445e3b49 powder that makes you say yes 2021-07-09 23:04:18 -04:00
Nadyr
573006ca86 powder that makes you say yes 2021-07-09 23:01:43 -04:00
Nadyr
a768e3a8f9 powder that makes you say yes 2021-07-09 22:53:31 -04:00
Nadyr
7ddc05bfda powder that makes you say yes 2021-07-09 21:57:23 -04:00
Nadyr
73196eaa8c powder that makes you say yes 2021-07-09 21:55:45 -04:00
Nadyr
21d2214bb3 powder that makes you say yes 2021-07-09 21:51:59 -04:00
Aronai Sieyes
9fe03ccfe2 Merge pull request #10970 from VOREStation/Fixes/10967
Fixes #10967
2021-07-08 04:54:13 +00:00
Nadyr
7438d0f486 Merge pull request #2453 from CHOMPStationBot/upstream-merge-10948
[MIRROR] Adds a weretiger.
2021-07-08 00:15:00 -04:00
Nadyr
2c1005a60f Merge pull request #2448 from CHOMPStationBot/upstream-merge-10937
[MIRROR] Some plane tweaks.
2021-07-08 00:14:47 -04:00
Nadyr
3d1b39fffa Merge branch 'master' into upstream-merge-10961 2021-07-08 00:09:21 -04:00
Nadyr
eecb117b83 Merge pull request #2461 from CHOMPStationBot/upstream-merge-10955
[MIRROR] Fixup fake sun to work like planetary lights
2021-07-08 00:08:20 -04:00
Nadyr
df5558dde1 powder that makes you say yes 2021-07-08 00:05:58 -04:00
Nadyr
207513d17d Merge pull request #2443 from CHOMPStationBot/upstream-merge-10943
[MIRROR] Fix a handful of ghost/admin verbs
2021-07-08 00:01:14 -04:00
Nadyr
3dc8f881b4 Merge pull request #2457 from CHOMPStationBot/upstream-merge-10956
[MIRROR] Mobs with AI try to stab you when you eat them
2021-07-08 00:00:47 -04:00
Nadyr
cbafdd15a0 Merge pull request #2456 from CHOMPStationBot/upstream-merge-10957
[MIRROR] Simplemobs can do cool emotes now
2021-07-08 00:00:23 -04:00
Nadyr
1212755f9c Merge pull request #2455 from CHOMPStationBot/upstream-merge-10953
[MIRROR] Fix security cameras showing weird space thing
2021-07-07 23:59:57 -04:00
Nadyr
8b67f6b69d Merge pull request #2451 from CHOMPStationBot/upstream-merge-10949
[MIRROR] More painting tweaks
2021-07-07 23:56:53 -04:00
Nadyr
a646fe3bd4 Merge pull request #2450 from CHOMPStationBot/upstream-merge-10944
[MIRROR] Lazy attempt at eating micros inside food
2021-07-07 23:56:29 -04:00
Nadyr
74a5348126 Merge pull request #2449 from CHOMPStationBot/upstream-merge-10945
[MIRROR] 4 fixes
2021-07-07 23:55:47 -04:00
Nadyr
7846005ead powder that makes you say yes 2021-07-07 23:55:15 -04:00
Nadyr
56649cac06 Merge pull request #2439 from CHOMPStationBot/upstream-merge-10928
[MIRROR] SSInput and Diagonal Movement
2021-07-07 23:53:36 -04:00
Nadyr
2537a89bc6 Merge pull request #2445 from CHOMPStationBot/upstream-merge-10936
[MIRROR] Fixes packaged burger sprite
2021-07-07 23:53:20 -04:00
Nadyr
b88233de91 powder that makes you say yes 2021-07-07 23:50:59 -04:00
Nadyr
d66fc25a4b Merge pull request #2441 from CHOMPStationBot/upstream-merge-10932
[MIRROR] CONVEYORS
2021-07-07 23:48:04 -04:00
Nadyr
c1af5cd937 Merge pull request #2438 from CHOMPStationBot/upstream-merge-10930
[MIRROR] Vore fixes
2021-07-07 23:47:45 -04:00
Nadyr
89438f1256 Merge pull request #2440 from CHOMPStationBot/upstream-merge-10931
[MIRROR] Makes ghosts able to play as some mobs sometimes
2021-07-07 23:46:55 -04:00
Nadyr
97181764d3 powder that makes you say yes 2021-07-07 23:45:33 -04:00
Nadyr
821ab11478 powder that makes you say yes 2021-07-07 22:51:43 -04:00
Nadyr
96cde51cbf powder that makes you say yes 2021-07-07 22:21:53 -04:00
Chompstation Bot
16c5baeb02 Bleed outdoor light onto walls and such 2021-07-08 01:32:53 +00:00
Aronai Sieyes
5b15eff22b Merge pull request #10955 from VOREStation/Arokha/fakesunfix
Fixup fake sun to work like planetary lights
2021-07-08 00:49:07 +00:00
Aronai Sieyes
d95001837b Merge pull request #10954 from Very-Soft/protectpoppyandchicks
Protects Poppy and chicks from being vored
2021-07-07 23:46:55 +00:00
Aronai Sieyes
23b84b3dca Merge pull request #10956 from VOREStation/Arokha/stabby
Mobs with AI try to stab you when you eat them
2021-07-07 23:43:35 +00:00
Aronai Sieyes
f9c7593677 Merge pull request #10957 from Very-Soft/simplemobemotes
Simplemobs can do cool emotes now
2021-07-07 23:43:28 +00:00
Aronai Sieyes
378fd085fc Merge pull request #10953 from VOREStation/Arokha/seccamera
Fix security cameras showing weird space thing
2021-07-07 21:15:05 +00:00
Chompstation Bot
28c2ee46d3 Adds a weretiger. 2021-07-07 21:08:45 +00:00
Aronai Sieyes
a0b482e956 Merge pull request #10949 from VOREStation/Arokha/persistcross
More painting tweaks
2021-07-07 21:07:31 +00:00
Aronai Sieyes
2e0f953d5e Merge pull request #10944 from VOREStation/Arokha/smoleat
Lazy attempt at eating micros inside food
2021-07-07 19:04:28 +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
ef79e49ee2 Some plane tweaks. 2021-07-07 19:03:14 +00:00
Chompstation Bot
287a5deee3 Use material defines more 2021-07-07 19:02:05 +00:00
Aronai Sieyes
81e3ff6bc0 Merge pull request #10936 from MarinaGryphon/burg
Fixes packaged burger sprite
2021-07-07 19:01:49 +00:00
Chompstation Bot
b22cc8df95 Fix a handful of ghost/admin verbs 2021-07-07 18:39:12 +00:00
Aronai Sieyes
2718c29ce3 Merge pull request #10932 from VOREStation/Arokha/conv
CONVEYORS
2021-07-07 18:37:59 +00:00
Aronai Sieyes
1deccaed87 Merge pull request #10931 from Very-Soft/ghostlyanimals
Makes ghosts able to play as some mobs sometimes
2021-07-07 18:37:53 +00:00
Chompstation Bot
1513fbe0cb SSInput and Diagonal Movement 2021-07-07 18:35:44 +00:00