Commit Graph

493 Commits

Author SHA1 Message Date
Dahlular
9867eae532 Merge pull request #1310 from Kabramen/Stargate-SG-1
Stargate SG-1 (New Gateway Map + Ghost role)
2021-06-22 23:31:56 -06:00
Kabra_men
31d4db56a1 Stargate SG-1 2021-06-21 04:19:12 -03:00
QuoteFox
2af71745eb Merge pull request #1230 from ArchieBeepBoop/nanites
[Ready] Nanite Updates + Nanite TGUI Next
2021-06-19 13:00:53 +01:00
quotefox
a8d775127e jesus, I just want armrests. 2021-06-19 01:07:33 +01:00
quotefox
c0571dccb7 all this for a stupid chair?! 2021-06-19 00:53:05 +01:00
quotefox
be869a8dd2 whoops. 2021-06-19 00:49:52 +01:00
quotefox
0d54d98d67 Single Sofa Chair 2021-06-19 00:48:54 +01:00
Archie
0b902d1cf9 overlay runtime 2021-06-18 14:24:39 -03:00
AuStation Bot
4e6997922e Adds Unum deck 2021-06-18 14:06:11 -03:00
Archie
aa92a9422f Merge remote-tracking branch 'upstream/master' into nanites 2021-06-16 20:40:14 -03:00
quotefox
8001a3ef1c New glitter animation 2021-06-15 09:18:29 +01:00
Archie
729b31f055 Merge remote-tracking branch 'upstream/master' into nanites 2021-06-13 02:02:07 -03:00
Archie
1f124358b0 Mimic behavioral changes and a runtime 2021-06-11 21:00:35 -03:00
Archie
ee803dcf82 Fixes K9 sleepers 2021-06-07 01:51:49 -03:00
Archie
aee40336eb Merge remote-tracking branch 'upstream/master' into nanites 2021-06-07 00:55:47 -03: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
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
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
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
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
kevinz000
0d4b96fc76 Excludes certain ghost roles from being affected by health events 2021-05-30 20:20:01 -03:00
Chloe Carver-Brown
7eb73ca903 pog 2021-05-27 16:40:15 +01: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
QuoteFox
c0c040d42a Merge pull request #1182 from Kabramen/stone-floors
New craftable stone tiles!
2021-05-22 01:46:06 +01:00
Chloe Carver-Brown
659695ea75 ID Icons redux lets fucking go this took too long 2021-05-21 22:57:23 +01:00
Kabra_men
7588ea639e New craftable stone tiles! 2021-05-20 14:25:32 -03:00
Chloe Carver-Brown
f9c33637ec Medics love me 2021-05-20 17:55:51 +01:00
Chloe Carver-Brown
8872b20c42 Woah! 2021-05-20 10:34:18 +01:00
Dahlular
523d9c8767 Merge pull request #1175 from Chemlight/Less-Zoomies
Vehicle balance and holo sign buff
2021-05-19 01:40:57 -06:00
Chemlight
895341277d Vehicle balance
Went ahead and toned down the speed of a lot of vehicles, along with making a new variable that unbuckles a player if their size is too small/big. Additionally buffed some holo sign projectors.
2021-05-17 22:51:50 -07:00
Archie
4c3359e2b7 Wholesome drone toy 2021-05-13 04:31:36 -03:00
ToonClyde
2e8480abc4 cheeseburger backpack time 2021-05-10 02:54:15 -07:00
DragonTrance
88d7fb3dca fixes borg pixel shift, and borg expander also gives client-side resize action 2021-05-09 14:04:26 -07:00
Chloe Carver-Brown
55098e9c65 Woe, qol be upon ye 2021-05-05 00:29:18 +01:00
Archie
f3a4c96da6 Removes some references and adds one. 2021-05-03 20:31:01 -03:00
Dahlular
90ba8f2b64 Map fixes, gravity fixes, many fixes 2021-04-29 21:21:52 -06:00
Dahlular
4150636fa4 Revert "Revert "Merge branch 'master' into cumcom""
This reverts commit c2cc5c49c6.
2021-04-29 17:46:09 -06:00
Dahlular
c2cc5c49c6 Revert "Merge branch 'master' into cumcom"
This reverts commit 05c4645c35, reversing
changes made to d3867f491b.
2021-04-29 17:44:13 -06:00
Dahlular
05c4645c35 Merge branch 'master' into cumcom 2021-04-29 17:43:57 -06:00