Commit Graph
3859 Commits
Author SHA1 Message Date
QuoteFoxandGitHub 92c09fdfa9 Merge pull request #1231 from ArchieBeepBoop/matchbox
Matchbox runtime fix
2021-06-06 19:51:23 +01:00
QuoteFoxandGitHub 3b85fab3dd Merge pull request #1229 from ArchieBeepBoop/iconupdates
Ports: Icon state updates Part 1
2021-06-06 19:51:08 +01:00
QuoteFoxandGitHub 8f765f63a5 Merge pull request #1221 from Kabramen/radkini
Engislut
2021-06-06 19:50:30 +01:00
QuoteFoxandGitHub d1d3063310 Merge pull request #1205 from lyricalpaws/master
Patreon item update
2021-06-06 19:50:15 +01:00
DahlularandGitHub 8b43934c2c Merge pull request #1234 from ArchieBeepBoop/memoryleakfix
Fixes a major memory leak in shuttle code
2021-06-05 23:47:57 -06:00
Archie 62a15a68e3 Fixes a major memory leak in shuttle code 2021-06-05 18:34:45 -03:00
Archie fbd8d02ebb Matchbox runtime fix 2021-06-04 16:31:31 -03:00
Archie 8de3503b13 Revert "broken"
This reverts commit b1cb8dc083.
2021-06-04 15:50:47 -03:00
Archie b1cb8dc083 broken 2021-06-04 15:24:00 -03:00
LinandArchie a5cf94ab29 Merge pull request #10212 from Ghommie/Ghommie-cit471
Ports some hud and update_icon code updates.
2021-06-04 15:23:40 -03:00
Putnam3145andArchie d5f50d094a Merge pull request #10209 from Ghommie/Ghommie-cit470
ports "Standardize obj/updateicon() and update_icons() to update_icon()"
2021-06-04 15:06:24 -03:00
DahlularandGitHub 1d9a8dfca8 Merge pull request #1228 from ArchieBeepBoop/craft1
TGUI Next Crafting
2021-06-04 06:21:21 -06:00
DahlularandGitHub a307d46a15 Merge pull request #1227 from CapnMachaddish/snek-2.0
snek 2.0
2021-06-04 06:19:38 -06:00
DahlularandGitHub 3204045654 Merge pull request #1226 from ArchieBeepBoop/stomach
Cybernetic stomachs
2021-06-04 06:18:26 -06:00
DahlularandGitHub bd990db009 Merge pull request #1224 from ArchieBeepBoop/CLEANSYOURFACE
/datum/element/cleaning cleans your face!
2021-06-04 06:17:13 -06:00
DahlularandGitHub 262591ec3e Merge pull request #1222 from ArchieBeepBoop/dineradd
Diner additions
2021-06-04 06:07:29 -06:00
DahlularandGitHub d6821aa57d Merge pull request #1220 from ArchieBeepBoop/thief
Something about autotraitor thief
2021-06-04 06:02:52 -06:00
DahlularandGitHub 297049cc0f Merge pull request #1219 from ArchieBeepBoop/gas
Something about ghosts and admins not being able to analyze canisters
2021-06-04 06:02:27 -06:00
GhomandArchie 2f4acc589f Merge pull request #10893 from Arturlang/TGUI_Next_Crafting
[READY]TGUI Next Crafting
2021-06-03 17:02:11 -03:00
GhomandArchie 1ead72d12f Merge pull request #10811 from Arturlang/crafting_componitization
[READY]Ports TG updates to crafting and componentizes it
2021-06-03 16:29:33 -03:00
Marvin Megavolt c439ee995d snek 2.0 2021-06-03 03:40:00 -05:00
Archie 737685ca7f Cybernetic stomachs 2021-06-03 03:48:02 -03:00
DahlularandGitHub 5ee4e0c14e Merge pull request #1225 from ArchieBeepBoop/bottle
Ports: New Bottle Sprites
2021-06-02 21:27:01 -06:00
siliconsandArchie d97b68b689 Merge pull request #14613 from HeroWithYay/Bottle
New Bottle Sprites
2021-06-03 00:16:13 -03:00
Archie 67b63f3dff /datum/element/cleaning cleans your face! 2021-06-02 23:11:51 -03:00
Archie 3345e45d91 Diner additions 2021-06-02 19:52:33 -03:00
Kabra_men 6ea19bb7d2 Engislut 2021-06-02 18:20:06 -03:00
Archie f3218677d3 Something about autotraitor thief 2021-06-02 18:05:28 -03:00
Archie 70e4319ce7 Fixes unreachable code 2021-06-02 16:05:05 -03:00
DahlularandGitHub dcac6a9e7e THIS SHIT DOESN'T LAST LONG ENOUGH. GIVE ME MORE RAIN. 2021-06-02 08:32:22 -06:00
DahlularandGitHub e4849634b6 Merge pull request #1218 from ArchieBeepBoop/cleanup
Cleaning up Layenia Rain Code
2021-06-02 03:25:52 -06:00
Archie 7403056507 Cleaning up Layenia Rain Code 2021-06-02 06:22:57 -03:00
DahlularandGitHub 6eb5a19fd3 Merge pull request #1217 from ArchieBeepBoop/rainingin
It's raining in Layenia?
2021-06-02 03:05:28 -06:00
Archie 2032ce3017 It's raining in Layenia 2021-06-02 05:53:15 -03:00
Archie dc9e374d24 Merge remote-tracking branch 'upstream/master' into rain 2021-06-02 04:20:31 -03:00
Archie 966da5dbbf Rain v1 2021-06-02 04:20:23 -03:00
DahlularandGitHub 102675a6fb Merge pull request #1216 from ArchieBeepBoop/radiationstuffagain
Radiation flags and dissipation fix
2021-06-01 22:52:19 -06:00
Archie 266fafeaa2 Radiation flags and dissipation fix 2021-06-02 01:33:35 -03:00
DahlularandGitHub 651b5ace30 Merge pull request #1215 from ArchieBeepBoop/radiationstuffagain
Fixes sludge spawning underneath structures / Sludge minor nerf
2021-06-01 21:54:16 -06:00
Archie 95cb98a093 aaaa 2021-06-02 00:50:27 -03:00
Archie 35fd4afb46 Fixes sludge spawning underneath structures. 2021-06-02 00:49:14 -03:00
Archie bcadc3dc01 Nerf this 2021-06-01 23:45:56 -03:00
DahlularandGitHub a9b239c113 Merge pull request #1214 from ArchieBeepBoop/radiationstuffagain
Fixes a whoopsie with the plutonium sludge radiation component.
2021-06-01 20:19:26 -06:00
Archie 3e4d2b56c1 Whoopsie doopsie. 2021-06-01 23:05:59 -03:00
DahlularandGitHub 2c58c0bee7 Merge pull request #1213 from ArchieBeepBoop/harvesterrework
Reworks Energy Harvesters, swiftly ends 40+ harvester meta
2021-06-01 18:32:55 -06:00
Archie 158b260683 Comment 2021-06-01 21:26:36 -03:00
Archie a94f6cdbc0 Intensity change 2021-06-01 21:26:08 -03:00
Archie 509eb2b055 Temp changes 2021-06-01 21:25:31 -03:00
Archie 9121e7a6c4 Reworks Energy Harvester Limits and Feedback 2021-06-01 21:24:54 -03:00
DahlularandGitHub f3aa289a68 Merge pull request #1212 from ArchieBeepBoop/heirloomstuff
Adminbus heirloom objective
2021-06-01 16:24:40 -06:00