Commit Graph

231 Commits

Author SHA1 Message Date
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
Archie
f3e05543f5 Funny TEG Update 2021-02-25 03:41:11 -03:00
DragonTrance
cd3ca2b8d1 sorting thirst code + not-water replenishes hydration 2021-02-23 17:19:06 -07:00
QuoteFox
1c509bd31e Roleplay Warning smite. 2021-02-22 00:54:05 +00:00
DragonTrance
3ebb7488de Merge branch 'master' into plant-adding 2021-02-21 12:06:48 -07:00
Chloe Carver-Brown
63063ecd9b It liiiiiives 2021-02-20 14:48:12 +00:00
Chloe Carver-Brown
a38a978f70 Revert "Poggers"
This reverts commit 389291b46a.
2021-02-19 23:35:57 +00:00
Chloe Carver-Brown
389291b46a Poggers 2021-02-19 22:19:12 +00: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
DragonTrance
7207063a63 hrngng booba 2021-02-08 21:19:56 -07:00
Chemlight
2a2979f33b Don't touch me! (neutral trait)
Adds a new neutral trait called distant, kind of like apathetic but focused soly on headpats.
2021-02-08 06:27:48 -08:00
QuoteFox
b90f60d3a6 Valentines flowers - Admin spawn only
brap cum plant.
2021-02-07 06:09:42 +00:00
QuoteFox
ecf93da4b1 Economy part 1
Economy part 1
2021-01-25 10:47:15 +00:00
Dahlular
893bd14014 Revert "ports hat throwing" 2021-01-20 09:20:55 -07:00
CygnusB
edf030d4b7 YEEHAWPARTDNERSYES
YEAAHHFDG
2021-01-19 18:28:13 -03:00
Dahlular
9f0b22fa95 Code Cleanup + Cushions 2021-01-18 01:14:58 -07:00
QuoteFox
83567cf685 Ports techweb backend refactor & co.
from https://github.com/Citadel-Station-13/Citadel-Station-13/pull/9737
2021-01-15 18:28:36 +00:00
Archie
acc286734d Test LF 2021-01-14 14:50:31 -03:00
kevinz000
b5fe141a49 Supply Pod Code Update 2021-01-14 14:31:35 -03:00
DeltaFire
2b79e974eb Merge pull request #13909 from silicons/twitch_plays
Twitch Plays: Clown Car
2021-01-10 14:03:51 -03:00
kevinz000
13607df1a9 Merge pull request #9836 from Ghommie/Ghommie-cit364
Ports "Uses defines for turf atmos"
2021-01-10 04:21:09 -03:00
Archie
c164b52b30 Merge remote-tracking branch 'upstream/master' into nexties2 2021-01-08 15:20:47 -03:00
Archie
78da9a5a12 Merge branch, update to current 2021-01-08 07:26:35 -03:00
kevinz000
939d8258de Merge pull request #10813 from Ghommie/Ghommie-cit540
Unicode support updates from tgstation.
2021-01-08 07:11:56 -03:00
Lin
02da471330 Merge pull request #10238 from Ghommie/Ghommie-cit478
Brings in some mapping code updates.
2021-01-06 15:39:13 -03:00
Lin
6ef6d21a84 Merge pull request #9722 from Ghommie/Ghommie-cit320
Umodularize saycode and meat slabs.
2021-01-05 17:23:36 -03:00
kevinz000
5d80346f8f Merge pull request #9993 from Ghommie/Ghommie-cit412
Ports tgstation loom changes, and durathred golems.
2021-01-05 16:54:23 -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
Ghom
291dcf9515 Merge pull request #10575 from Arturlang/TGUIs_Nexties
[TESTMERGE] Properly working TGUI Next
2021-01-04 19:47:54 -03:00
Lin
5dd1bc07c6 Ports "Added TRAIT_DISK_VERIFIER, refactors how fake disk checks work slightly 2021-01-04 02:36:28 -03:00
kevinz000
b21c65055a Surgery fix package 2021-01-02 19:03:45 -03:00
QuoteFox
a9575ffc21 Merge pull request #794 from lyricalpaws/master
Let synthliz and IPC have and be infected by nanites
2021-01-02 14:02:24 +00:00
QuoteFox
aa2280113d Merge pull request #785 from DragonTrance/this-is-my-3rd-branch-i-hate-github-sometimes
Expander + VTEC upgrades Fix (times two)
2021-01-01 02:26:01 +00:00
Chloe Carver-Brown
c2a937bb73 Changing Nanotrasen to Kinaris where needed 2020-12-31 17:58:25 +00:00
Chloe Carver-Brown
63506caa48 Adding synthliz to is_helpers 2020-12-31 16:48:26 +00:00
Chloe Carver-Brown
c3ad6b5500 Making silicons their own biotype 2020-12-31 16:45:11 +00:00
kevinz000
10069637a5 Merge pull request #9441 from lolman360/whydowehave1000branches
Ports /tg/ advanced surgerytools and tool defines.
2020-12-30 00:42:50 -03:00
DragonTrance
529824b320 borg expander + vtec upgrades fix 2020-12-29 11:15:19 -07:00
Chloe
9538bc4245 adds breadify and nugget smite options 2020-12-29 12:27:34 +00:00
Archie
5710e12cb5 Surgery ports 1 2020-12-27 04:25:28 -03:00
QuoteFox
f390fbc8b5 Merge pull request #774 from quotefox/heat
Heat and Detect Heat Lewd Traits
2020-12-26 22:21:25 +00:00
QuoteFox
3588d4044c Heat Traits
For fun and for anyone wanting to do their heat/breeding fetish. Opt-in required.
2020-12-26 20:57:09 +00:00
DragonTrance
eaaa0c16a6 Corpse Flower
aka brap farm
2020-12-23 11:21:20 -07:00
QuoteFox
2a1761e8ad Merge pull request #763 from ArchieBeepBoop/fixes-the-bugs
Fixing some annoying bugs.
2020-12-22 00:52:55 +00:00
Lin
b9fe810525 Merge pull request #9959 from Ghommie/Ghommie-cit397
patching some combat mode edge cases and issues.
2020-12-20 11:32:28 -03:00
Archie
3c940086be v1 2020-12-09 20:14:12 -03:00