Commit Graph

468 Commits

Author SHA1 Message Date
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
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
Dahlular
3cefcf6eb1 Merge remote-tracking branch 'upstream/master' 2021-04-29 17:24:55 -06:00
Dahlular
2723507a0f potential atmos fixes 2021-04-28 23:01:54 -06:00
Chloe Carver-Brown
310a58f27a ogh 2021-04-20 15:29:01 +01:00
Dahlular
50a7413928 Merge remote-tracking branch 'upstream/master' 2021-04-18 23:19:38 -06:00
Dahlular
6c72b0e0e6 Merge remote-tracking branch 'upstream/master' into cumcom 2021-04-18 23:17:45 -06:00
Archie
d89aec9ce1 Random Parallax 2021-04-19 02:08:21 -03:00
Dahlular
39d446817b Merge remote-tracking branch 'upstream/master' 2021-04-17 21:09:59 -06:00
Dahlular
677561e819 Merge remote-tracking branch 'upstream/master' 2021-04-17 21:05:19 -06:00
QuoteFox
fb21e779b1 Nail paint cosmetics 2021-04-17 22:41:02 +01:00
Chloe Carver-Brown
5e5b43212e fuck shit piss 2021-04-08 01:36:09 +01:00
QuoteFox
275438d526 reduce radio volume
reduce radio volume
2021-03-28 23:18:27 +01:00
QuoteFox
58b12a8147 Item sounds 2021-03-28 22:05:25 +01:00
QuoteFox
8cceffb594 radio in sounds. 2021-03-28 18:53:32 +01:00
QuoteFox
99f861a512 new plating and shelves 2021-03-28 16:48:02 +01:00
QuoteFox
a4826e6eab Revert "Merge remote-tracking branch 'upstream/master'"
This reverts commit f5cf7f6f5a, reversing
changes made to a32444dae7.
2021-03-27 10:56:34 +00:00
QuoteFox
a1644811ac Ported Map; Lambda Station 2021-03-25 12:06:32 +00:00
Dahlular
400354cc6e Merge remote-tracking branch 'upstream/master' into cumcom 2021-03-25 00:15:19 -06:00
Dahlular
149ba24169 Merge branch 'master' into cumcom 2021-03-24 07:55:15 -06:00
QuoteFox
8e15edf08a cigs no longer make a mountain of ash when put out. 2021-03-24 11:53:01 +00:00
QuoteFox
fa3e559b78 Merge pull request #1046 from lyricalpaws/master
Adds psychologist role, changes Box med a bit
2021-03-23 18:13:40 +00:00
Chloe Carver-Brown
0620b5c682 psych job! 2021-03-23 17:21:44 +00:00
QuoteFox
38b5e5b0eb locker and jumpsuit equip sounds. 2021-03-23 16:27:18 +00:00
Dahlular
ea6beba104 Merge remote-tracking branch 'upstream/master' 2021-03-22 11:18:41 -06:00
QuoteFox
9cf0ca814b Revert "some fixes!"
This reverts commit 0c5effbc7b.
2021-03-20 19:01:30 +00:00
QuoteFox
5dbf439e0b Revert "lets not rip a hole in space time."
This reverts commit 9d16326f34.
2021-03-20 19:00:47 +00:00