shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,807 Commits 5 Branches 0 Tags
4e528da5c283fa00367b809a3010268fee970dfe
Commit Graph

188 Commits

Author SHA1 Message Date
r4d6
7347cb0ba6 Merge branch 'master' into RCD-Updates 2020-01-03 03:09:11 -05:00
r4d6
58a986696f Add RCD and RPD to Engie's protolathe 
Half-port with bonus : https://github.com/tgstation/tgstation/pull/47289
 2020-01-03 02:46:25 -05:00
r4d6
5c94e02eac Add simple RCD Circuits 
Port : https://github.com/tgstation/tgstation/pull/45357
 2020-01-03 02:32:43 -05:00
kevinz000
ec67a38093 Merge pull request #10330 from keronshb/keronnanite 
More nanites from /tg/station
 2019-12-31 19:32:05 -08:00
Seris02
9b3654e4ff telescopic IVs 2019-12-29 23:26:53 +08:00
keronshb
390cfd8b64 Nanite ports from /tg/ 
Ports a couple of the newer nanite features from /tg/
 2019-12-28 16:56:17 -05:00
Hatterhat
681508482c magazine metal cost tweaks, speedloader in AIB 2019-12-24 04:15:25 -06:00
Linzolle
70e50e57cd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update 2019-12-17 20:21:49 -06:00
Putnam3145
c0e548427b Merge pull request #10076 from Ghommie/Ghommie-cit437 
Fixes alien tech node not being unlockable with subtypes of the accepted items.
 2019-12-17 11:58:39 -08:00
BlackMajor
83a707ee93 Removes medihounds, same treatment as janihounds 2019-12-13 13:48:22 +13:00
Ghommie
3d42744d8a conflict with a certain framework for tech node discounts or something I guess. 2019-12-07 00:38:32 +01:00
Ghommie
7cb2092fcb typo 2019-12-07 00:04:05 +01:00
Ghommie
ae94e1cfbe Fixed alien tech node not being unlockable with subtypes of the accepted items. 2019-12-06 23:45:36 +01:00
Linzolle
cc54e5230f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update 2019-11-25 21:01:25 -06:00
GrayRachnid
0b60d5e6ef derp 2019-11-24 17:48:09 -05:00
GrayRachnid
c8e52fb8e1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs 2019-11-22 15:24:15 -05:00
Hatterhat
f161b01f6b ayytech plants 2019-11-19 17:26:44 -06:00
Lin
6aa6eaafe6 Merge branch 'master' into abductor-update 2019-11-15 23:24:51 +00:00
kevinz000
02e8a73265 Merge pull request #9737 from Ghommie/Ghommie-cit326 
Ports techweb backend refactor & co.
 2019-11-14 16:45:09 -07:00
kevinz000
4c89b8c33f Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII 
[Ready] [Testmerge] MK II Cargo Rework - Sell harder edition
 2019-11-14 16:00:45 -07:00
TrilbySpaceClone
6e328ea1b1 art of the deal 2019-11-11 07:26:12 -05:00
Ghommie
b2b1390bd3 Ports techweb backend refactor & co. 2019-11-07 05:07:38 +01:00
TrilbySpaceClone
82b148b7b7 Merge branch 'master' into Cargo_MKII 2019-11-03 17:53:06 -05:00
TrilbySpaceClone
a8248c68f4 perhaps 2019-11-03 12:53:02 -05:00
TrilbySpaceClone
5c4cd15762 Hmm 2019-11-03 11:05:45 -05:00
Ghommie
b17346a44e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit220 2019-10-30 14:46:42 +01:00
Linzolle
52b6e659c1 Merge branch 'abductor-update' of https://github.com/Linzolle/Citadel-Station-13 into abductor-update 2019-10-29 23:59:16 -05:00
Linzolle
266f1ff958 Merge remote-tracking branch 'upstream/master' into abductor-update 2019-10-29 23:58:01 -05:00
kevinz000
da387bfdf4 Merge pull request #9620 from YakumoChen/proto_beanbag 
Adds Beanbag Slugs to Seclathe
 2019-10-27 16:13:31 -07:00
YakumoChen
325de79b3a adds beanbag slug to starter node 2019-10-26 10:22:50 +00:00
kevinz000
8b22c95479 Merge pull request #9606 from Ghommie/Ghommie-cit270 
Unmodularize research.
 2019-10-25 20:09:26 -07:00
Lin
dbaf5a54e6 Merge branch 'master' into abductor-update 2019-10-25 06:17:24 +00:00
kevinz000
d8fc3e7211 Merge pull request #9564 from kappa-sama/aliumtators 
The syndicate are led by aliens.
 2019-10-24 18:49:48 -07:00
Ghommie
6f19899dd2 Unmodularize research. 2019-10-24 23:28:15 +02:00
Linzolle
9250b1c103 big uppdate season 2019-10-23 21:08:47 -05:00
Poojawa
6fc750dca0 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-21 19:13:19 -05:00
kappa-sama
4767a91ad2 Update _techweb.dm 2019-10-21 17:04:47 -04:00
kappa-sama
797d6b4795 copy paste spaghetti 
forgive me
 2019-10-21 09:23:33 -04:00
kappa-sama
3077d538ec makes alien tech unlocking more consistent 
and also makes them cost more and require more relevant research to get, as well as decreasing their export price
 2019-10-21 09:21:48 -04:00
Poojawa
ffeae20daa Merge remote-tracking branch 'Citadel-Station-13/master' into syntheticbloods 2019-10-18 06:01:52 -05:00
Linzolle
88814415dc tend wounds 2019-10-17 16:59:33 -05:00
Poojawa
394c947d14 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-11 23:10:45 -05:00
Linzolle
b50804dfc3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dissection 2019-10-11 20:06:26 -05:00
kevinz000
b0b274762c Merge pull request #9441 from lolman360/whydowehave1000branches 
Ports /tg/ advanced surgerytools and tool defines.
 2019-10-11 12:10:31 -07:00
lolman360
2709570f01 techwebs and stuff i forgot 
i am not a 1 commit  wonder
 2019-10-08 20:02:26 +11:00
Poojawa
3113074bfb Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-08 02:55:32 -05:00
GrayRachnid
9f8ad74bf9 New traumas and some other things. 2019-10-08 03:53:01 -04:00
kevinz000
7c94029006 Merge pull request #9431 from Ghommie/Ghommie-cit221 
Ports "Makes the illegal tech node harder to unlock"
 2019-10-07 23:35:18 -07:00
Ghommie
8228e52f43 Ports "Makes the illegal tech node harder to unlock" 2019-10-07 06:19:48 +02:00
Ghommie
5232728ee7 Ports "Adds three new .38 ammo types", also lazily adding .357 AP 2019-10-07 05:25:47 +02:00