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
324d039f64
adds these
2020-05-09 18:00:23 -04: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
43dc1319d9
Merge pull request #12097 from Ghommie/Ghommie-cit720
...
Implementing the NO_PUBLIC_LATHE build_type flag.
2020-05-07 21:04:57 -07:00
2cbb659eb9
Implementing the NO_PUBLIC_LATHE build_type flag.
2020-05-03 06:15:40 +02:00
a194d7dafe
merge conflict and job/dept discounts support.
2020-05-03 02:11:05 +02:00
f659c036ef
Merge pull request #12036 from kevinz000/electrochromatic_windows
...
Electrochromatic (dim-on-demand) windows
2020-05-02 19:13:29 +00: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
af3651172c
wow lotsa effort huh
2020-04-26 03:29:31 -07:00
f6a5f92ff3
Merge pull request #11918 from Ghommie/Ghommie-cit689
...
nerf to biogenerator upgrades, removal of flour and glass bottles designs.
2020-04-25 16:59:38 -07:00
36512938a0
Merge pull request #11991 from DeltaFire15/nanite-repli-protocols
...
Adds nanite replication protocols to our techweb
2020-04-25 16:54:32 -07:00
94f014589d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
2020-04-25 17:09:34 +02:00
0c1c879fb4
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit697
2020-04-25 02:49:59 +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
c8b3032087
Merge branch 'master' into cube-world
2020-04-23 02:04:56 -04:00
5a6a205b9d
Merge pull request #11868 from Arturlang/tackling_and_lunge
...
Ports TG Tackling and uses it to rework bloodsucker lunge
2020-04-21 15:50:44 +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
25b1b889dc
amazing truely amazing
2020-04-19 19:09:20 -04:00
0663a3f01c
ceiling to avoid infinity ez nutriment.
2020-04-18 18:18:22 +02:00
08b0a2460e
Comment.
2020-04-18 17:55:34 +02:00
beb34321e7
nerf to biogenerator upgrades and purge of inorganic glass bottles designs.
2020-04-18 17:53:00 +02: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
2134515d5c
Merge remote-tracking branch 'upstream/master' into tackling_and_lunge
2020-04-15 12:19:37 +03:00
8fed6552cd
last fixes
2020-04-14 22:44:47 -04: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
fe755a1424
Tackling Working so far, working on the lunge now
2020-04-09 21:42:00 +03: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
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
6b2bbe0133
there fixed
2020-02-26 06:51:03 +08:00
c4e9472b85
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into nomoreailipreading
2020-02-24 17:48:58 +08:00
cbdb12e110
yes
2020-02-24 17:47:29 +08:00
ba81184fef
Merge branch 'master' into quickpatch-enzyme
2020-02-22 18:06:17 -06:00
2cd8adf4da
Update medical_designs.dm
2020-02-22 19:06:11 -05:00
cf8b41723d
Update medical_designs.dm
2020-02-22 18:35:40 -05:00
c638a83e23
Merge branch 'master' into more_implants
2020-02-22 18:34:02 -05:00
becdd3c4c1
Merge branch 'master' into more_crates+bags
2020-02-22 18:33:26 -05:00
511692a7cb
Update medical_designs.dm
2020-02-22 18:30:32 -05:00
c3ec44b0d0
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
2020-02-22 19:54:10 +08:00
8fbfd07692
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-22 00:55:32 +01:00
26bbc64f16
Merge pull request #11136 from Owai-Seek/broomport-2-17-19
...
Ports Broom, Tweak Janitor Vendor
2020-02-20 11:48:06 +01:00
Ghommie