Commit Graph

828 Commits

Author SHA1 Message Date
Dahlular
255ff340f7 Merge pull request #1258 from ArchieBeepBoop/blacklistchanges
Blacklists Dust events from Layenia
2021-06-13 14:40:18 -06:00
Archie
c29e3137d8 Chaos chaos chaos 2021-06-12 07:03:35 -03:00
Archie
da0016adaf Even more hideous logic 2021-06-12 06:59:48 -03:00
Archie
85d6d20dbf blacklists dust from layenia 2021-06-11 23:08:13 -03:00
Archie
1f124358b0 Mimic behavioral changes and a runtime 2021-06-11 21:00:35 -03:00
Dahlular
da87f22c14 Merge pull request #1246 from ArchieBeepBoop/dynamicstuffv2
(Hopefully) Makes it so midround autotraitor requires sec
2021-06-09 16:39:28 -06:00
Archie
196b9b9a07 Midround autotraitor requires sec 2021-06-08 18:48:27 -03:00
Archie
604ae740db Crystal Asteroid event 2021-06-08 18:39:11 -03:00
Archie
a912d4eeab Fixes it, finally. 2021-06-08 07:51:40 -03:00
Archie
8d0d83ef70 Revert 2021-06-08 07:17:51 -03:00
Archie
c05781a579 Lotsa runtime fixes 2021-06-08 01:06:46 -03:00
Archie
ee803dcf82 Fixes K9 sleepers 2021-06-07 01:51:49 -03:00
QuoteFox
4744e87296 Merge pull request #1235 from ArchieBeepBoop/something
Dynamic Changes
2021-06-06 19:52:08 +01:00
QuoteFox
3b85fab3dd Merge pull request #1229 from ArchieBeepBoop/iconupdates
Ports: Icon state updates Part 1
2021-06-06 19:51:08 +01:00
QuoteFox
d1d3063310 Merge pull request #1205 from lyricalpaws/master
Patreon item update
2021-06-06 19:50:15 +01:00
Archie
51b9ee28f9 Midrounds 2021-06-06 04:50:54 -03:00
Archie
56b18a7deb Dynamic Changes 2021-06-06 04:47:48 -03:00
Archie
62a15a68e3 Fixes a major memory leak in shuttle code 2021-06-05 18:34:45 -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
Lin
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
Putnam3145
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
Archie
f3218677d3 Something about autotraitor thief 2021-06-02 18:05:28 -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
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
Chloe Carver-Brown
7eb73ca903 pog 2021-05-27 16:40:15 +01:00
Archie
3178e2e8ce Fixes midround antag preference 2021-05-24 05:27:10 -03:00
Archie
8d4cd6b5cf Temp dirty fix. 2021-05-23 20:42:58 -03:00
silicons
45b2014369 Ports bluespace pipes from yogs 2021-05-23 18:42:40 -03:00
silicons
d4db51175f Merge pull request #13965 from Xantholne/GoodNightDisky
Good Night Disky
2021-05-23 04:36:37 -03:00
Dahlular
76c15f0edc Merge pull request #1187 from CapnMachaddish/borg-upgrade-fixes
Fixes Mediborgs/hounds and improves borg upgrade code
2021-05-23 00:39:24 -06:00
Dahlular
4872af2742 Merge pull request #1184 from lyricalpaws/icon_upgrades
ID Icons redux lets fucking go this took too long
2021-05-23 00:36:12 -06:00
Dahlular
62bed91cc3 Merge pull request #1179 from lyricalpaws/lets-go-mining
Mining balance changes, some new icons, and good stuff.
2021-05-23 00:32:26 -06:00
Marvin Megavolt
6b22c933cd Beep boop, Herr Doktor 2021-05-21 21:32:01 -05:00