Commit Graph

62 Commits

Author SHA1 Message Date
Archie
6224bcd199 Fixes Railings and Rods 2021-05-02 00:09:59 -03: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
3cefcf6eb1 Merge remote-tracking branch 'upstream/master' 2021-04-29 17:24:55 -06:00
QuoteFox
55dc9201c4 scratch that, buggy. 2021-04-25 13:47:02 +01:00
QuoteFox
90114133ab bug fix mood. 2021-04-25 13:16:03 +01:00
QuoteFox
0d3f1039bb Mood warnings 2021-04-25 12:56:16 +01:00
QuoteFox
345b128e20 Big characters, make a boom when walking. 2021-04-22 15:44:01 +01:00
Dahlular
677561e819 Merge remote-tracking branch 'upstream/master' 2021-04-17 21:05:19 -06:00
QuoteFox
58b12a8147 Item sounds 2021-03-28 22:05:25 +01:00
Dahlular
ea6beba104 Merge remote-tracking branch 'upstream/master' 2021-03-22 11:18:41 -06:00
QuoteFox
706ee6d3eb Hyperstation RP beta 0.1 and alot of bug fixes. 2021-03-20 12:36:02 +00:00
Dahlular
b8f601203e More progress 2021-03-09 03:12:30 -07:00
DragonTrance
063712017b Update nanites.dm 2021-03-03 11:10:38 -07:00
DragonTrance
4b931c5e92 mob_biotypes are now flags instead of lists 2021-03-03 11:08:36 -07:00
QuoteFox
6ca9ac4123 Revert "Revert "Tg status tab""
This reverts commit b4fa877cc7.
2021-02-27 04:30:52 +00:00
QuoteFox
b4fa877cc7 Revert "Tg status tab"
This reverts commit 931f3ca63b.
2021-02-27 04:02:22 +00:00
QuoteFox
931f3ca63b Tg status tab
finally.
2021-02-27 01:47:19 +00:00
DragonTrance
cd3ca2b8d1 sorting thirst code + not-water replenishes hydration 2021-02-23 17:19:06 -07:00
QuoteFox
506f6b19be Thirst, mood buff for qunching, No longer spawn thirsty, no longer suicidal if starving and dehydrated alone. 2021-02-22 19:12:01 +00:00
DragonTrance
3ebb7488de Merge branch 'master' into plant-adding 2021-02-21 12:06:48 -07:00
QuoteFox
f698f16e27 Thirst System
Thirst System
2021-02-13 14:44:55 +00:00
DragonTrance
58b69503e3 #4 2021-02-11 20:02:40 -07:00
Timothy Teakettle
5cca6129a5 Regal Rats + Mice in hat 2021-01-15 21:18:12 -03:00
DeltaFire
2b79e974eb Merge pull request #13909 from silicons/twitch_plays
Twitch Plays: Clown Car
2021-01-10 14:03:51 -03:00
Ghom
bfe9fa745c Merge pull request #11044 from Arturlang/TGUI_Next_Uplink
TGUI Next Uplinks
2021-01-09 15:35:32 -03:00
Archie
78da9a5a12 Merge branch, update to current 2021-01-08 07:26:35 -03:00
Putnam3145
0db5aed986 Merge pull request #10056 from Ghommie/Ghommie-cit430
Ports "Slightly improves visible and audible messages."
2021-01-05 16:51:22 -03:00
BlackMajor
4b8b03fea0 Ports new Brain Traumas from /tg/. Does not include the shitty creeper antag or Wizard Traumas, i'm porting wizard traumas later. Also adds the Desynchronizer and changes the way some heaRing args are handled. 2021-01-05 16:32:02 -03:00
Archie
9e37d3be62 Fix merge conflicts 2021-01-05 03:41:08 -03:00
Lin
b0779fe2d7 Merge pull request #9983 from Ghommie/Ghommie-cit408
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
2021-01-05 01:34:16 -03:00
Ghom
291dcf9515 Merge pull request #10575 from Arturlang/TGUIs_Nexties
[TESTMERGE] Properly working TGUI Next
2021-01-04 19:47:54 -03:00
Chloe Carver-Brown
1685663b80 Let IPCs and SynthLiz be injected by nanites 2020-12-31 16:46:14 +00:00
Dip
2a5c61dc45 fuck me 2020-11-22 01:29:01 -03:00
kevinz000
4bd370532d Merge pull request #8401 from Ghommie/Ghommie-cit11
Refactoring Implants' loc n°3
2020-11-12 03:53:27 -03:00
kevinz000
752a3d9bcc Merge pull request #9418 from Ghommie/Ghommie-cit216
Porting a load of viro, (sentient) disease, symptoms code updates from tg.
2020-11-03 01:51:18 -03:00
Ghom
28cdb9c5f1 Oh no. 2020-10-30 05:30:15 -03:00
Dahlular
ee0017721e Merge pull request #627 from ArchieBeepBoop/spooky
The Spookening: Ports Jacqueline the Pumpqueen event + Dullahan and subsequent Fixes
2020-10-29 22:51:07 -06:00
Dip
1006fb3c7e mood runtime 2020-10-28 16:57:47 -03:00
kevinz000
2c7c66fc89 Merge pull request #9589 from Ghommie/Ghommie-cit259
Porting GetComponent macros removal, and few other updates.
2020-10-27 14:42:55 -03:00
Dahlular
7aa0fccefa Merge pull request #608 from Kabramen/prosthetic-limb-quirk-revamp
Ports selectable prostethic limbs from Yog + quirk blacklist and two o…
2020-10-23 16:27:54 -06:00
Kabra_men
dc35022521 fix hypersensitive so it actually works now 2020-10-22 02:29:39 -03:00
deathride58
cc26593463 Merge pull request #9047 from Poojawa/syntheticbloods
RGB Blood Reworks + Blood generator
2020-10-17 22:25:16 -03:00
Dip
f0bf81cb1f Runtimes and balance 2020-10-13 06:10:12 -03:00
Dip
aa7d47a23b Examine Code Refactor 2020-10-06 23:36:21 -03:00
QuoteFox
631090cf04 Dynamic glidespeed
ported from yogstation
2020-10-05 03:58:10 +01:00
kevinz000
b8bc551d51 Merge pull request #9601 from Ghommie/Ghommie-cit265
Ports move force and move resist, movement/pushing/pulling tweaks & co.
2020-10-03 19:35:47 -03:00
kevinz000
4714bd9012 initial element 2020-10-01 22:36:19 -03:00
Archie
7a5ef569b6 Radiation Shutters + Micro Opts + Engine Weight 2020-09-30 03:51:53 -03:00
Dip
3cd86a33c6 Radiation Update Port 2020-09-28 22:18:29 -03:00