Commit Graph

2130 Commits

Author SHA1 Message Date
Archie 6de7ffa2f5 Fixes a possible issue with areas in layenia & logs loan 2021-06-18 00:46:31 -03:00
Elli-Skala b648ef4c7a Update strange_rock.dm 2021-06-17 00:04:19 -04:00
Archie aa92a9422f Merge remote-tracking branch 'upstream/master' into nanites 2021-06-16 20:40:14 -03:00
Dahlular 6d6642e06a Merge pull request #1285 from ArchieBeepBoop/statustabfix
Fixes Status tab for Slimes and Sentient Disease
2021-06-16 17:33:46 -06:00
Archie 5793aeffa8 Minor status tab fixes 2021-06-16 17:13:58 -03:00
quotefox 2e53798e05 *chirp and *caw for avians.
emotes.
2021-06-16 18:16:10 +01:00
Dahlular 48b1ab604f Merge pull request #1276 from ArchieBeepBoop/ninjanothing
Fixes the nothing objective
2021-06-15 18:15:10 -06:00
Archie 20b7ed80a1 Fixes the nothing objective 2021-06-15 20:41:52 -03:00
Dahlular 6c3c2ccbdc Merge pull request #1272 from ArchieBeepBoop/titles
Two engineering alt job titles
2021-06-15 01:46:00 -06:00
Archie 934e37296d Two alt titles 2021-06-14 21:52:44 -03:00
kevinz000 ec4430bc50 Demodularization, fixes missing icons 2021-06-14 03:57:25 -03:00
Archie 2d6d24f2aa bananae 2021-06-14 03:44:16 -03:00
Dahlular b87e873581 Merge pull request #1265 from ArchieBeepBoop/morerevchanges
Two more rev changes.
2021-06-13 22:16:54 -06:00
Archie efa78a3433 a 2021-06-14 00:43:41 -03:00
Archie 5a7af7c317 Specify? 2021-06-14 00:41:33 -03:00
Archie 4917acf373 Don't need to specify. 2021-06-14 00:41:04 -03:00
Archie 8073f77d69 Threshold, broadcast 2021-06-14 00:40:03 -03:00
Dahlular 1a989a45b4 Merge pull request #1262 from ArchieBeepBoop/ghostchanges
Allows anything that's not a human or silicon to ghost
2021-06-13 14:42:40 -06:00
Dahlular 67a464a197 Merge pull request #1261 from ArchieBeepBoop/well-then
Should increase this timer a bit more...
2021-06-13 14:42:09 -06:00
Dahlular 8f785eb246 Merge pull request #1255 from ArchieBeepBoop/inconsistencies
Fixes code inconsistencies, Icons, Diner
2021-06-13 14:40:00 -06:00
Archie 729b31f055 Merge remote-tracking branch 'upstream/master' into nanites 2021-06-13 02:02:07 -03:00
Archie 4d1b608e9c silicon 2021-06-13 01:55:13 -03:00
Archie 5f100df030 ghost changes 2021-06-13 01:51:40 -03:00
Archie ebb2283741 Well well well 2021-06-12 21:13:42 -03:00
Dahlular 8cb3860020 Merge pull request #1237 from ArchieBeepBoop/apathy
Apathy Minor Revamp / Death moodlet tweak
2021-06-11 18:57:21 -06:00
Archie 8a3d26fa26 Some rev changes 2021-06-11 21:15:31 -03:00
Archie 6986dbc4dc Fixes several things 2021-06-11 18:14:57 -03:00
Dahlular 4fb7d70419 Merge pull request #1249 from ArchieBeepBoop/Access
Medical Access Changes
2021-06-09 20:07:43 -06:00
Archie 19be13ae59 Medical Access Changes 2021-06-09 19:45:55 -03:00
Archie 5afadccfb5 free performance 1 2021-06-09 18:33:20 -03:00
kevinz000 89bbf98b8f Bunch more runtimes 2021-06-08 06:17:33 -03:00
Archie c05781a579 Lotsa runtime fixes 2021-06-08 01:06:46 -03:00
Dahlular 11ea34aa6a Merge pull request #1241 from ArchieBeepBoop/grandiose
[s] Microwave Easter Egg
2021-06-07 16:48:47 -06:00
Archie fe40689164 Microwave Easter Egg 2021-06-07 19:03:38 -03:00
Archie 7b835c2128 Better logic. 2021-06-07 17:47:39 -03:00
Archie 15bb908589 Fixes an obvious oversight 2021-06-07 01:34:15 -03:00
Archie aee40336eb Merge remote-tracking branch 'upstream/master' into nanites 2021-06-07 00:55:47 -03:00
Archie db7e03157e Double var 2021-06-06 19:25:55 -03:00
Archie 6527848b90 Revamps Apathy 2021-06-06 19:24:29 -03:00
QuoteFox 50fee7c17c Merge pull request #1232 from ArchieBeepBoop/Generatorgoboom
Generator Changes, Runtime fixes.
2021-06-06 19:51:37 +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 8f765f63a5 Merge pull request #1221 from Kabramen/radkini
Engislut
2021-06-06 19:50:30 +01:00
QuoteFox d1d3063310 Merge pull request #1205 from lyricalpaws/master
Patreon item update
2021-06-06 19:50:15 +01:00
Archie 011752f1d2 Runtimes, Generator Changes 2021-06-05 01:50:46 -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
Ghom a83427d394 Merge pull request #11025 from Arturlang/TGUI_Next_Nanites
Ports TGUI Next and a lot of misc updates for nanites.
2021-06-04 15:03:31 -03:00
kevinz000 89a56e8f35 Merge pull request #10569 from keronshb/RemoteMoodResearch
Ports the Nanite Remote, Nanite Mood Programs + Rebalance, and the Research Generating Nanites
2021-06-04 14:39:09 -03:00
kevinz000 dd45aece5b Merge pull request #10330 from keronshb/keronnanite
More nanites from /tg/station
2021-06-04 14:17:33 -03:00
Ghom 629b5975ca Merge pull request #10096 from Citadel-Station-13/kevinz000-patch-123
nanites can no longer spread through atmospherics-blocking objects
2021-06-04 14:17:03 -03:00