Commit Graph

905 Commits

Author SHA1 Message Date
Dahlular
5b875682c2 Merge pull request #1396 from Support-Sergal/OrangeCreamsicle
Added a Orange creamsicle, and a new snack!
2021-08-14 23:13:13 -06:00
Yipper Yapper
ad78cbbeea Added borb seed 2021-08-07 00:17:20 -07:00
Yipper Yapper
45f3b82352 quick bug fix 2021-08-04 04:42:00 -07:00
Yipper Yapper
d41c575250 Your Able to destroy them now!
Wooooo yeah baby
2021-08-04 04:41:47 -07:00
Dahlular
a2b74e5d91 Merge pull request #1389 from Support-Sergal/Merp
Micro Bricks IMPORT
2021-07-28 19:38:59 -06:00
Yipper Yapper
ab8b9f08c9 Import part two.
added alt click to rotate and added to cargo packs.
2021-07-28 20:27:34 -07:00
Dahlular
3e450266bc Adds an Art Atrium 2021-07-28 16:46:50 -06:00
Yipper Yapper
147e4d5f58 Import stage one
adding icons and code
2021-07-28 03:57:40 -07:00
Kabra_men
d17faa961e Stargate map changes and additions + new mineral wall sprites 2021-07-24 20:39:01 -03:00
Dahlular
e941fcbc51 Merge pull request #1378 from ArchieBeepBoop/bsanomalychange
Bluespace Anomaly Changes
2021-07-23 00:01:06 -06:00
Archie
abf75d214b Fixes paintings again yo 2021-07-23 02:04:05 -03:00
Archie
573b074ac3 Bluespace Anomaly Changes 2021-07-22 23:55:52 -03:00
Archie
d6494c37df This can break everything, but let's try it. 2021-07-22 04:25:28 -03:00
Archie
56fec5c4ba Merge remote-tracking branch 'upstream/master' into bobross 2021-07-22 03:36:06 -03:00
Dahlular
97036e117f Merge pull request #1369 from ArchieBeepBoop/vvrefactorlesgoooooo
Ports the VV Refactor by Kevinz.
2021-07-22 00:33:19 -06:00
Dahlular
5897d7fef3 Bluespace anomalies are more difficult to get
Makes bluespace anomalies more difficult in their occurance; this is due to the fact that people have often been clouded randomly by them. Not fun.
2021-07-22 00:28:51 -06:00
kevinz000
29cb1a0ae9 Ports the VV Refactor by Kevinz. 2021-07-20 17:09:43 -03:00
quotefox
4e09683c28 Dont rush these things... 2021-07-20 12:19:41 +01:00
quotefox
e661136269 do_not_cover_butt = true
new thing.
2021-07-20 12:16:56 +01:00
Archie
b443f02b6d Merge remote-tracking branch 'upstream/master' into bobross 2021-07-19 22:53:33 -03:00
QuoteFox
f914df3bc4 Merge pull request #1364 from Azarak/uuuuhhhh
Ports Long Range Gas Analyzer
2021-07-20 02:44:29 +01:00
Azarak
fe39ee1533 Ranged analyser 2021-07-19 14:34:37 +02:00
kevinz000
21c3b8e67b Merge pull request #9221 from Sishen1542/chappy
adds some new nullrods with some back end null rod refactors
2021-07-15 17:56:19 -03:00
kevinz000
865ff4fa08 Merge pull request #9610 from Ghommie/Ghommie-cit273
ports anti-magic component code updates (holymelon sold separately).
2021-07-15 17:43:18 -03:00
Winter Flare
a24fe4445a Update bags.dm 2021-07-15 11:05:05 -04:00
Dahlular
f130f2b8e0 Merge pull request #1350 from ArchieBeepBoop/ohno
[s] A very meme-y item.
2021-07-15 08:09:41 -06:00
Dahlular
81725f27c0 Merge pull request #1323 from ArchieBeepBoop/fuck512
Component Updates - Taking 512 compatibility out back and beating it with a stick
2021-07-15 08:08:03 -06:00
Archie
1a5d5485da eh 2021-07-15 02:29:55 -03:00
Archie
e47eb5af2e Oh yes. 2021-07-15 02:29:28 -03:00
QuoteFox
f1371aea92 Merge pull request #1343 from ArchieBeepBoop/sauna
Ports: Sauna ovens, but modularized
2021-07-08 18:51:26 +01:00
Kabra_men
5ad4b776e5 new statue, dungeon and some necessary changes in stargate 2021-07-06 16:57:27 -03:00
Archie
01d21b9b66 Sauna 2021-07-06 15:04:00 -03:00
Dahlular
50538b9027 Temporarily disables lone op 2021-07-03 23:52:06 -06:00
Kabra_men
b0a98f0c18 sandstone walls now can connect to windows 2021-07-01 17:31:17 -03:00
Kabra_men
daefbb71a7 Fixes, changes and new wall sprites 2021-07-01 16:07:36 -03:00
Archie
c26d02207a Merge remote-tracking branch 'upstream/master' into fuck512 2021-06-28 03:32:04 -03:00
Archie
cd92d19ca6 Something about scrubbing space turfs 2021-06-28 03:29:49 -03:00
Dahlular
cbab78dc33 Merge pull request #1333 from ArchieBeepBoop/datasorting
Fixes a long lasting runtime with filter data sorting.
2021-06-27 23:01:53 -06:00
Dahlular
07e0116433 Merge pull request #1332 from ArchieBeepBoop/aistuff
AI camera stuff, runtime fixes, AI fixes, etc.
2021-06-27 23:00:43 -06:00
Archie
774d95c6b4 Fixes data sorting runtimes 2021-06-27 16:13:58 -03:00
kevinz000
cf0105de4a Ports "Ghosts can now see the AI's camera" and "Removes error message while shunting [fix]" 2021-06-27 14:03:06 -03:00
Ghom
8e982a32c4 Ports TG painting code (Needs VV rework by kevinz) 2021-06-27 05:01:29 -03:00
Archie
8173a1756e Merge remote-tracking branch 'upstream/master' into cache2 2021-06-27 04:32:49 -03:00
Archie
e1975fea4b WIP - TG Asset Cache 2021-06-27 04:16:16 -03:00
Dahlular
c60866c101 Merge pull request #1330 from ArchieBeepBoop/mmmmcache
Ports: Station minimaps
2021-06-27 00:59:33 -06:00
Ghom
338d0e6e7b Merge pull request #11406 from kevinz000/minimaps
Ports station minimaps from Yogstation thank you monster860 you are an epic gamer
2021-06-27 03:45:55 -03:00
Dahlular
780d0899a6 Changelings at higher chaos, Bloodsuckers lower 2021-06-26 21:29:53 -06:00
TotallyNotADog
1fa3330ea8 ripley capacitor 2 2021-06-26 16:23:24 -05:00
quotefox
d72441e929 Revert "Merge pull request #1320 from TotallyNotADog/ripleyScrewdriver"
This reverts commit 049cfe0379, reversing
changes made to 69a3b58ae0.
2021-06-26 21:13:13 +01:00
QuoteFox
049cfe0379 Merge pull request #1320 from TotallyNotADog/ripleyScrewdriver
ripley capacitor
2021-06-26 20:27:21 +01:00