Commit Graph

1094 Commits

Author SHA1 Message Date
Archie
9fc02e6cde Goonchat Update 2021-01-08 07:50:51 -03:00
Archie
78da9a5a12 Merge branch, update to current 2021-01-08 07:26:35 -03:00
QuoteFox
180f171b37 Merge pull request #830 from ArchieBeepBoop/sanitycheck
Fixes Codewords not changing color and MkUltra enthrall not having the proper hearing_args
2021-01-08 09:01:04 +00:00
Archie
f2d51707fb tones down things that could nuke the codebase 2021-01-06 22:56:41 -03:00
Putnam3145
66a9ce77fb Merge pull request #9964 from GrayRachnid/fixmyblunder
Fixes Codewords not changing color and MkUltra enthrall not having the proper hearing_args
2021-01-06 22:14:03 -03:00
QuoteFox
cd4fe44bbf Merge pull request #789 from Tename/boggers
Borg equipment changes
2021-01-07 00:17:31 +00:00
Ghom
6dbdfa0c14 Merge pull request #10570 from kevinz000/map_network_helpers
Power cable + auto mapping helpers
2021-01-06 15:44:06 -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
QuoteFox
8ece586711 Merge pull request #825 from ArchieBeepBoop/updatesaycode
Saycode Update Package, durathread golems, loom updates, new traumas, science powergaming inc
2021-01-06 14:18:03 +00:00
CapnMachaddish
e17050ce27 Allow TTS circuit to change its sayverb 2021-01-06 02:42:23 -06:00
kevinz000
625b35b8cb Merge pull request #9755 from Ghommie/Ghommie-cit331
lentext to length, yet another 513 requirement.
2021-01-05 17:39:10 -03:00
kevinz000
19d6a19b4a Merge pull request #9548 from Ghommie/Ghommie-cit251
Fixing radio emotes conflict with drunk memes.
2021-01-05 17:25:53 -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
BlackMajor
02cb328921 Merge pull request #9747 from Ghommie/Ghommie-cit329
Fixing AI holopad speech text being small and whispers ending in multiple exclamation marks oxymoron.
2021-01-05 16:58:19 -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
QuoteFox
78427df75f Food icons, and some custom ones
Food icons, (mainly ports from Eris, they do amazing work over there with their sprite work), and some custom ones I made myself with similar colour pallets. Also makes synth meat less attractive.
2021-01-05 13:20:54 +00:00
Archie
9e37d3be62 Fix merge conflicts 2021-01-05 03:41:08 -03:00
Archie
10e74b643e Fix scanners.dm conflict 2021-01-05 03:31:28 -03:00
QuoteFox
bb83dfc24f Merge pull request #823 from ArchieBeepBoop/morereagentfixesyeeeet
More reagent bullshit fixes YEEEEET
2021-01-05 06:21:13 +00: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
dc7c1aca91 Merge pull request #10538 from Putnam3145/chemistry-aaa
Fixes to chemistry
2021-01-04 21:26:29 -03:00
Putnam3145
0b39a4986c Merge pull request #10532 from Ghommie/Ghommie-cit503
A few reagents related fixes.
2021-01-04 21:23:36 -03:00
Archie
0fba3d15e1 scannerfix 2021-01-04 21:22:21 -03:00
Ghom
3b33c6c341 Ports chem dispenser macro recording 2021-01-04 19:57:22 -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
kevinz000
7f2de64be7 RCD Update Sync 2021-01-04 18:13:02 -03:00
QuoteFox
0699c90a50 Merge pull request #814 from VladinXXV/blueshield
Paramed uniforms aren't invisible on digi anymore/adds premium secdrobe option "blueshield"
2021-01-04 16:09:20 +00:00
QuoteFox
26bc758558 Merge pull request #817 from ArchieBeepBoop/glass
Deletes two reagent logging runtimes
2021-01-04 16:08:59 +00:00
Archie
ea58ef76b1 painkiller and pina colada fix 2021-01-04 04:01:14 -03:00
Archie
3dde862df2 Delete runtimes 2021-01-04 03:02:42 -03:00
QuoteFox
481eb021cc Merge pull request #816 from ArchieBeepBoop/disky
Ports "Added TRAIT_DISK_VERIFIER, refactors how fake disk checks work"
2021-01-04 05:42:09 +00:00
QuoteFox
4d164c0b5b Merge pull request #813 from ArchieBeepBoop/thalpyyyyy
Updates our Fermichems, fixes synthtissue.
2021-01-04 05:41:29 +00:00
QuoteFox
3484561d38 Merge pull request #815 from ArchieBeepBoop/keybindings
Unmodularize Keybinds pt1
2021-01-04 05:41:11 +00:00
Lin
5dd1bc07c6 Ports "Added TRAIT_DISK_VERIFIER, refactors how fake disk checks work slightly 2021-01-04 02:36:28 -03:00
kevinz000
21cbe5095a Merge pull request #10356 from deathride58/sprintprefs
Adds space to sprint and toggle sprint as preferences
2021-01-04 01:51:21 -03:00
kevinz000
00a753d632 Merge pull request #9817 from Ghommie/Ghommie-cit357
Fixing a keybinding issue.
2021-01-04 01:49:46 -03:00
QuoteFox
68c6277ee8 Remove radio in
say.dm is fucked and makes no sense.
2021-01-04 04:35:28 +00:00
Lin
6810aa0a94 Merge pull request #10214 from Ghommie/Ghommie-cit472
Brings carbon action intent hotkeys down to living.
2021-01-04 01:31:40 -03:00
kevinz000
ca55e5f8b0 Merge pull request #9804 from Ghommie/Ghommie-cit351
Unmodularize keybindings.
2021-01-04 01:31:17 -03:00
Vladin
a7ee5f4ce0 requiem
uniform no longer awkwardly caps and shit added to vendor
2021-01-03 20:10:09 -05:00
Vladin
ec989eefe0 Revert "Revert "fucking digi""
This reverts commit 31dc2dceeb.
2021-01-03 19:41:47 -05:00
Vladin
31dc2dceeb Revert "fucking digi"
This reverts commit 5c737c6c1e.
2021-01-03 19:37:12 -05:00
Vladin
5c737c6c1e fucking digi
this should fix the bs coat for digi
2021-01-03 19:33:58 -05:00
Vladin
03e081662c fucking seclites
i knew it was too good to be true
2021-01-03 19:23:18 -05:00
Vladin
1965387bea Blueshield Shit
adds blueshield uniform and coat. also should fix paramedic uniforms.
2021-01-03 19:19:16 -05:00
Archie
97fc5821d7 Synthtissue fix (Thanks to Fermi! <3) 2021-01-03 16:54:22 -03:00
Archie
622a6232b0 Chem master analyze fix, synthtissue update 2021-01-03 07:15:51 -03:00
Archie
efb7bc7b45 Updates reagent holder code 2021-01-03 06:00:13 -03:00