Commit Graph

2274 Commits

Author SHA1 Message Date
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
Archie
6c4c6de32f Pride Station 13 2021-05-23 18:35:55 -03:00
Archie
f727bc71d9 Whoops. 2021-05-23 18:13:29 -03:00
silicons
08134e18b7 Jungle gateway nerf and touch ups: ape edition 2021-05-23 17:44:09 -03:00
silicons
a3b5013a1c Initial Jungle Gateway 2021-05-23 17:41:20 -03:00
Archie
68b983acc7 Fixes simple mob emote spam 2021-05-23 16:37:26 -03:00
Archie
f478ec14a3 disky spam fix 2021-05-23 04:55:27 -03:00
Lin
58ebfe465f Merge pull request #14023 from Citadel-Station-13/silicons-patch-8
the disk now snores every minute instead of every 2 seconds
2021-05-23 04:36:51 -03:00
silicons
d4db51175f Merge pull request #13965 from Xantholne/GoodNightDisky
Good Night Disky
2021-05-23 04:36:37 -03:00
Dahlular
648d380594 Merge pull request #1173 from ArchieBeepBoop/vendingtipping
Ports Vending Machine Tipping
2021-05-23 00:45:46 -06:00
Dahlular
fd965d341d Merge pull request #1190 from DragonTrance/cook-job-titles
More Job Titles
2021-05-23 00:41:17 -06: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
Archie
c2f167bf11 Small TEG Feedback Tweak 2021-05-22 04:08:42 -03:00
DragonTrance
557e14c42d more job titles
Poissonier - Someone who cooks with fish
Vintner - Another word for Winemaker
Somelier - A person who handles wine
Expediter - A person who takes food from the kitchen and hands it out
2021-05-21 20:31:37 -07:00
DragonTrance
27c66ef07a thanks github very cool 2021-05-21 20:04:19 -07:00
DragonTrance
1a87cadb37 fixes verbs not refreshing after you die 2021-05-21 19:43:43 -07:00
Marvin Megavolt
6b22c933cd Beep boop, Herr Doktor 2021-05-21 21:32:01 -05:00
QuoteFox
90654935a8 Merge pull request #1186 from DragonTrance/character-change-warning
Let players know that savefile preferences got updated
2021-05-22 01:59:26 +01:00
DragonTrance
8a2a558a7e let players know there's recent changes 2021-05-21 17:47:52 -07:00