Commit Graph

2294 Commits

Author SHA1 Message Date
Archie
fbd8d02ebb Matchbox runtime fix 2021-06-04 16:31:31 -03:00
Dahlular
1d9a8dfca8 Merge pull request #1228 from ArchieBeepBoop/craft1
TGUI Next Crafting
2021-06-04 06:21:21 -06:00
Dahlular
a307d46a15 Merge pull request #1227 from CapnMachaddish/snek-2.0
snek 2.0
2021-06-04 06:19:38 -06:00
Dahlular
3204045654 Merge pull request #1226 from ArchieBeepBoop/stomach
Cybernetic stomachs
2021-06-04 06:18:26 -06:00
Dahlular
bd990db009 Merge pull request #1224 from ArchieBeepBoop/CLEANSYOURFACE
/datum/element/cleaning cleans your face!
2021-06-04 06:17:13 -06:00
Dahlular
d6821aa57d Merge pull request #1220 from ArchieBeepBoop/thief
Something about autotraitor thief
2021-06-04 06:02:52 -06:00
Dahlular
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
Ghom
2f4acc589f Merge pull request #10893 from Arturlang/TGUI_Next_Crafting
[READY]TGUI Next Crafting
2021-06-03 17:02:11 -03:00
Ghom
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
Archie
67b63f3dff /datum/element/cleaning cleans your face! 2021-06-02 23:11:51 -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
Archie
7403056507 Cleaning up Layenia Rain Code 2021-06-02 06:22:57 -03: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
Dahlular
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
Dahlular
f3aa289a68 Merge pull request #1212 from ArchieBeepBoop/heirloomstuff
Adminbus heirloom objective
2021-06-01 16:24:40 -06:00
Archie
4925c15e49 Adminbus heirloom objective 2021-06-01 19:18:39 -03:00
Dahlular
1f2e31160c Merge pull request #1167 from ArchieBeepBoop/tcomms
[Experimental] Telecomms Updates + Telecomms TGUI Update
2021-06-01 15:52:54 -06:00
Dahlular
a073d136a4 Merge pull request #1206 from ArchieBeepBoop/autotator
Excludes Ghost Roles from certain Health Events + Autotraitor Fix Package Pt2
2021-06-01 04:27:10 -06:00
Dahlular
287f59af1a Merge pull request #1200 from ArchieBeepBoop/bluespacepipe
Ports: Bluespace Pipes
2021-06-01 04:22:46 -06:00
Dahlular
dc2957900c Merge pull request #1201 from ArchieBeepBoop/stargazerfix
Makes Stargazers work on Layenia too
2021-06-01 04:18:54 -06:00
Dahlular
3aa6cd76ce Merge pull request #1198 from ArchieBeepBoop/junglereserve
Ports: Jungle Gateway
2021-06-01 04:11:54 -06:00
Dahlular
550f709ad9 Revert "Ports Vending Machine Tipping" 2021-06-01 04:07:43 -06:00
Dahlular
3218c844bb Revert "Something about taming vending machines" 2021-06-01 04:06:42 -06:00
Archie
725f8f96de And this. 2021-05-31 13:37:50 -03:00
Archie
c31112cc72 Also that. 2021-05-31 13:24:52 -03:00
Archie
2ad966435a Something about taming vending machines 2021-05-31 13:15:35 -03:00
Archie
8c9ed329d8 Fix 2021-05-30 20:29:36 -03:00
Archie
b432248f46 Autotraitor piggyback 2021-05-30 20:20:14 -03:00
kevinz000
0d4b96fc76 Excludes certain ghost roles from being affected by health events 2021-05-30 20:20:01 -03:00
Dahlular
7e250ce9ee Merge pull request #1202 from ArchieBeepBoop/autotator
Fixes midround antag preference
2021-05-30 16:44:11 -06:00
Archie
1d52981a44 Even BETTER logic. 2021-05-30 19:36:56 -03:00
Archie
65d9136e36 Better logic. 2021-05-30 19:35:18 -03:00
Archie
fc20d59168 logic! 2021-05-30 19:27:11 -03:00
Dahlular
43919aadc5 Merge pull request #1194 from ArchieBeepBoop/sleeptight
Sleep tight, Disky - Bed Tucking Element
2021-05-30 16:19:03 -06:00
Dahlular
5540734214 Merge pull request #1188 from DragonTrance/fix-verbs
fixes verbs not refreshing after you die
2021-05-30 16:16:10 -06:00
Dahlular
99f8f10190 Merge pull request #1199 from ArchieBeepBoop/pride
Pride Station 13
2021-05-30 16:13:46 -06:00
Archie
3178e2e8ce Fixes midround antag preference 2021-05-24 05:27:10 -03:00
Archie
78808ad2b3 Stargazes wll also detect cloud turfs for their calculations 2021-05-24 02:53:43 -03:00
Archie
8d4cd6b5cf Temp dirty fix. 2021-05-23 20:42:58 -03:00
Archie
7fed066d30 Design fix 2021-05-23 19:36:39 -03:00
Archie
a81c46d52b We do not use the mat rework yet. 2021-05-23 18:48:38 -03:00
Archie
c58fd2bfb6 a 2021-05-23 18:46:45 -03:00
Archie
e3f0f32618 whoops, line ending. 2021-05-23 18:45:43 -03:00
silicons
45b2014369 Ports bluespace pipes from yogs 2021-05-23 18:42:40 -03:00