Commit Graph

31 Commits

Author SHA1 Message Date
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
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
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
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
c2a937bb73 Changing Nanotrasen to Kinaris where needed 2020-12-31 17:58:25 +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
Lin
a7c539ac32 Ports reagents id removal and typepath usage. 2020-12-09 14:32:36 -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
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
quotefox
8adc12fc22 Merge pull request #104 from SynnGraffkin/Ore-Silo-Mechfab
Modifies the Mechfab to use the Ore Silo
2019-12-02 20:24:36 +00:00
Toast
85cad6b4ac Fixing one of two fuckups 2019-11-27 20:14:37 -05:00
Toast
a378b6239a Code stuff 2019-11-27 16:36:02 -05:00
Toast
6bb71fc5c0 Update mech_fabricator.dm 2019-11-27 02:31:53 -05:00
shellspeed1
d9412b94d8 fixes the rogue step or 3 involved. 2019-11-16 00:43:37 -08:00
shellspeed1
ed8c1e6a46 Update mecha_construction_paths.dm 2019-11-10 14:06:52 -08:00
quotefox
19810f7e98 Merge pull request #59 from Azarak/master
It's me trying to fix a conflict and I've never done this don't mind me
2019-11-08 20:48:47 +00:00
Azarak
1544eafb4f TG GENETICS AAAAAAAA
aaaaaaaa
2019-11-04 23:20:16 +01:00
shellspeed1
a6ff0cb5de Code Improvements for mech made by Nemvar at tg 2019-10-26 00:49:25 -07:00
shellspeed1
f122fc73f0 indent fix 2019-10-25 23:33:50 -07:00
shellspeed1
3ebb3464b6 makes it so ripley, firefighter, ody, and honk take capaictors and scanners to build 2019-10-25 22:53:49 -07:00
quotefox
b9a598bbd9 Merge pull request #36 from shellspeed1/Organ-updates-for-stasis-beds
Massive organ overhaul and some new surgeries ported from cit orginally created by Fermi. Mergeable
2019-10-18 21:47:14 +01:00
shellspeed1
470ec5d62b whew 2019-10-14 18:46:06 -07:00
Dahlular
d3bc3fd1f9 Neovgre and all of it's parts 2019-10-02 22:30:48 -06:00
Quotefox
7091cdbe8c Uploading all files. 2019-09-23 18:26:34 +02:00