7714fcfaba
more changes
2020-07-18 01:26:38 +01:00
15e137dd18
Merge branch 'master' into tray-and-jar
2020-07-01 22:06:17 +01:00
10a0e1b688
stick it on the right node
2020-06-30 00:46:27 +01:00
2e4c5e322d
tray and jar
2020-06-29 02:49:31 +01:00
5787a75dee
node
2020-06-27 18:20:13 -04:00
61caf7dde2
spraycan
2020-06-27 18:15:20 -04:00
45a6061958
Merge pull request #12596 from Ghommie/Ghommie-cit819
...
Porting further material datum features and improvements.
2020-06-27 14:53:28 -07:00
8b04fd70de
Merge pull request #12615 from Ghommie/Ghommie-cit821
...
Solving several issues.
2020-06-27 14:52:59 -07:00
8f6b31c26e
Solving several issues.
2020-06-26 18:40:20 +02:00
c5cbfa64e5
Porting further material datum features and improvements.
2020-06-24 20:45:17 +02:00
3cad6221ca
Merge pull request #12571 from Detective-Google/medigygax
...
Adds the medical-spec gygax
2020-06-24 08:43:30 -07:00
99a7c49e52
Merge pull request #12561 from shellspeed1/Ports-kyro-chems
...
Ports IV bags from TG
2020-06-21 14:11:10 -07:00
ab05e48149
adds the medical gygax
2020-06-20 16:22:28 -05:00
b490f02c78
Ports IV bags from TG
...
Ports the iv bag portion of https://github.com/tgstation/tgstation/pull/44531/files from tg.
2020-06-18 02:30:58 -07:00
17c38efbb0
Runtime Fixes
2020-06-18 11:24:08 +03:00
2229db2214
Merge branch 'master' into embed-changes
2020-06-17 16:40:34 +01:00
46c3e9e54d
Shuttles
2020-06-16 18:16:14 +03:00
e010212180
please work
2020-06-15 23:49:38 +01:00
8ec5672b85
tonne of fixes
2020-06-10 21:14:08 +01:00
95b8cd3956
first port
2020-06-10 20:33:01 +01:00
e80ec920e0
Moved the tanks to industrial tech node.
2020-06-04 16:42:10 -07:00
2002a273de
Makes empty internal tanks printable
2020-06-04 16:04:16 -07:00
ab5d65a454
Porting the BEPIS research machinery. ( #12277 )
...
* Initial B.E.P.I.S port.
* All nodes but sticky tape are in. Sweet.
* Mapping the BEPIS :DDD
* ah
* deers.
2020-05-24 13:05:15 -07:00
7fb96ab0cf
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
2020-05-12 20:06:59 +02:00
2b429a93d2
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit737
2020-05-10 06:30:41 +02:00
015660c806
Trilby's grammar is a F-
2020-05-10 06:21:29 +02:00
c4c4285b00
Reorganizing techweb nodes in a subfolder.
2020-05-10 06:20:04 +02:00
6067370a6f
shotgun shell clips ( #11955 )
...
* shell clips revised by based ghom
* lmao yeet better not forget that bit
* nitpicking but also merge 11976 first
* No freeloaders.
* Update weapon_designs.dm
Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com >
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-05-09 02:49:25 +02:00
a194d7dafe
merge conflict and job/dept discounts support.
2020-05-03 02:11:05 +02:00
54e76e8ffb
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit697
2020-05-01 21:49:52 +02:00
1a6f5eb131
If it compiles it works
...
Kidding, tested on local and it runs fine.
Adds nanite protocols to the techweb, without BEPIS, aswell as adding one more protocol onto the ones ported from /tg
2020-04-23 15:15:26 +02:00
1659e2804e
Deletes lots of autoylathe copypasta.
2020-04-21 04:04:10 +02:00
c93f028a97
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
2020-04-21 01:53:41 +02:00
62418d3fb8
Merge pull request #11909 from Putnam3145/owai-broom-mop
...
Adds more service stuff to lathes.
2020-04-20 11:43:30 -07:00
14a5985891
Adds more service stuff to lathes.
2020-04-17 23:00:05 -07:00
4c6f1b622b
Porting Goofconomy & co.
2020-04-17 07:48:11 +02:00
4419dc13f5
changes and additons
2020-04-14 22:17:53 -04:00
a96f6238df
Merge pull request #10891 from Trilbyspaceclone/more_crates+bags
...
[Ready]Better crate options
2020-04-12 05:48:20 +02:00
f1deea99f7
adds back in the containment bag
2020-04-08 05:38:36 -04:00
736760ac06
Minesweeper oopsies etcetera.
2020-04-01 04:39:36 +02:00
3c97782a87
Merge pull request #11483 from Hatterhat/mining-borg-nerfs
...
mining borg nerfs - "they should be outclassed lategame"
2020-03-16 13:22:23 -07:00
1fe67d5ce9
a finger of the monkey's paw curls.
2020-03-16 01:35:47 -05:00
802d37a399
borgs should be outclassed lategame and not hunt
2020-03-15 15:55:31 -05:00
5a04b43db4
duffel baaaaaaaaaaags
2020-03-14 16:12:17 +08:00
aad3953355
Update all_nodes.dm
2020-03-12 20:52:07 -04:00
cccd0e9eef
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
2020-03-09 16:49:32 +08:00
178de5ee0d
Merge branch 'master' into more_crates+bags
2020-03-06 06:31:54 -05:00
5e603c1cce
Merge pull request #11064 from Trilbyspaceclone/more_implants
...
3 new arm tool set implants
2020-03-06 01:25:02 +01:00
44a9add328
Merge pull request #11328 from Trilbyspaceclone/Hey-Teens!
...
Removed unused techweb var - Cargo selling of Techwebs nodes
2020-03-06 01:21:09 +01:00
7e51cf9ab3
Removed unused techweb var
2020-03-04 16:30:10 -05:00
timothyteakettle