Commit Graph

1578 Commits

Author SHA1 Message Date
Dahlular
1d9a8dfca8 Merge pull request #1228 from ArchieBeepBoop/craft1
TGUI Next Crafting
2021-06-04 06:21:21 -06:00
Dahlular
a307d46a15 Merge pull request #1227 from CapnMachaddish/snek-2.0
snek 2.0
2021-06-04 06:19:38 -06:00
Dahlular
3204045654 Merge pull request #1226 from ArchieBeepBoop/stomach
Cybernetic stomachs
2021-06-04 06:18:26 -06:00
Ghom
2f4acc589f Merge pull request #10893 from Arturlang/TGUI_Next_Crafting
[READY]TGUI Next Crafting
2021-06-03 17:02:11 -03:00
Ghom
1ead72d12f Merge pull request #10811 from Arturlang/crafting_componitization
[READY]Ports TG updates to crafting and componentizes it
2021-06-03 16:29:33 -03:00
Marvin Megavolt
c439ee995d snek 2.0 2021-06-03 03:40:00 -05:00
Archie
737685ca7f Cybernetic stomachs 2021-06-03 03:48:02 -03:00
Archie
70e4319ce7 Fixes unreachable code 2021-06-02 16:05:05 -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
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
kevinz000
0d4b96fc76 Excludes certain ghost roles from being affected by health events 2021-05-30 20:20:01 -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
Archie
78808ad2b3 Stargazes wll also detect cloud turfs for their calculations 2021-05-24 02:53:43 -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
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
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
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
Chloe Carver-Brown
3fb7297d79 Whoops I did it again 2021-05-21 23:19:28 +01:00
Chloe Carver-Brown
659695ea75 ID Icons redux lets fucking go this took too long 2021-05-21 22:57:23 +01: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
Dahlular
d016fe918a Merge pull request #1174 from ToonClyde/some-clothing
cyberpunksleek/modern sweater
2021-05-19 01:39:09 -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