r4d6
|
4e528da5c2
|
Correct price and rpd
|
2020-01-04 19:06:56 -05:00 |
|
r4d6
|
221cb980d6
|
forgot a /
|
2020-01-03 03:25:53 -05:00 |
|
r4d6
|
880db10033
|
Forgot some more mats
|
2020-01-03 03:22:18 -05:00 |
|
r4d6
|
aedf634355
|
Fix mats.
|
2020-01-03 03:15:30 -05:00 |
|
r4d6
|
94cd2ea108
|
Merge branch 'RCD-Updates' of https://github.com/r4d6/Citadel-Station-13 into RCD-Updates
|
2020-01-03 03:13:21 -05:00 |
|
r4d6
|
3f5d4ad835
|
remove a duplicate comment
|
2020-01-03 03:13:03 -05:00 |
|
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 |
|
keronshb
|
baf8b28f3a
|
Fixes Reduced Diagnostics and adds disks
Fixes reduced diagnostics not working properly and adds program disks for each of the new nanites.
|
2019-12-29 16:03:38 -05:00 |
|
Seris02
|
b96bcf6eec
|
tiny fix
|
2019-12-29 23:47:30 +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 |
|
Ghom
|
2bc401e2d2
|
Merge pull request #10096 from Citadel-Station-13/kevinz000-patch-123
nanites can no longer spread through atmospherics-blocking objects
|
2019-12-21 16:48:56 +01:00 |
|
Ghom
|
5c3d3f4cc5
|
Is merging someone else's PR you personally fixed considerable as self-merging?
|
2019-12-21 16:40:32 +01:00 |
|
Ghom
|
4624a1739a
|
typo
|
2019-12-21 16:30:02 +01:00 |
|
Ghom
|
19fc981cc1
|
Merge pull request #9596 from Linzolle/abductor-update
Bring abductors up-to-date with /tg/.
|
2019-12-21 11:15:29 +01:00 |
|
Ghom
|
1748a5ee4b
|
Merge pull request #10054 from kappa-sama/patch-10
autolathe .357 speedloaders->bullets, surplus rifle bullets in hacked lathe
|
2019-12-20 13:27:35 +01: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 |
|
Putnam3145
|
c39a5d0462
|
Merge pull request #10011 from Arturlang/Bloodsuckers
Bloodsuckers, or, yknow, vampires.
|
2019-12-15 14:41:36 -08:00 |
|
BlackMajor
|
83a707ee93
|
Removes medihounds, same treatment as janihounds
|
2019-12-13 13:48:22 +13:00 |
|
kevinz000
|
41a61cffa7
|
Update utility.dm
|
2019-12-11 14:46:05 -07:00 |
|
Ghommie
|
414d4b7a90
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit408
|
2019-12-09 00:04:22 +01:00 |
|
Linzolle
|
1e2a4f606c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update
|
2019-12-08 14:17:00 -06:00 |
|
Artur
|
4711eb0987
|
Merge remote-tracking branch 'upstream/master' into Bloodsuckers
|
2019-12-07 15:53:11 +02:00 |
|
kevinz000
|
2e0b019bd7
|
Update utility.dm
|
2019-12-07 03:11:54 -07: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 |
|
kappa-sama
|
c1c2661b8c
|
consistency
|
2019-12-05 19:54:58 -05:00 |
|
kappa-sama
|
994411cc4e
|
metal
|
2019-12-05 19:49:48 -05:00 |
|
BlackMajor
|
a6f48ea74c
|
Merge pull request #9372 from Weblure/Xenobio-Hotkeys
[Ready] [Test Merge] Ports Xenobio Hotkeys
|
2019-12-06 11:29:34 +13:00 |
|
kappa-sama
|
676476726f
|
i forgot to actually add the bullet
|
2019-12-05 09:50:34 -05:00 |
|
kappa-sama
|
df0fa330bf
|
bullet
|
2019-12-05 09:49:09 -05:00 |
|
kappa-sama
|
329e07b037
|
357 bullets and rifle clips
|
2019-12-05 09:46:13 -05:00 |
|
Artur
|
af4eaf7f0f
|
Fixeesss
|
2019-12-03 23:09:11 +02:00 |
|
Putnam3145
|
8da17c5aaf
|
Merge pull request #9946 from Citadel-Station-13/kevinz000-patch-117
Removes hyperspeed from light pink stabilized for -4.5 stam/tick + free sprint
|
2019-12-01 23:12:35 -08:00 |
|
Putnam3145
|
4942002698
|
Merge pull request #10022 from Sishen1542/n
techfabs are now easier to investigate
|
2019-12-01 13:44:00 -08:00 |
|
Sishen
|
a4323b2e4e
|
Update _production.dm
|
2019-12-01 05:10:30 -07:00 |
|
Sishen
|
3ac863d0ac
|
Revert "n"
This reverts commit 975a1a968c.
|
2019-12-01 05:09:34 -07:00 |
|
Sishen
|
975a1a968c
|
n
|
2019-12-01 05:03:18 -07:00 |
|
kevinz000
|
2c19c55fc3
|
Update nanite_programs.dm
|
2019-11-28 23:00:09 -07:00 |
|
Ghommie
|
3b8aebbbc2
|
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
|
2019-11-29 00:40:16 +01:00 |
|
kevinz000
|
6b53845f06
|
Merge pull request #9268 from Thalpy/FERMICHEMCurTweaks
[READY] [Please merge me] Fermichem tweaks: Purity, Astral, RNG, MK, SMilk, SDGF, furranium, hatmium, eigen, nanite.
|
2019-11-26 16:01:48 -07:00 |
|
kevinz000
|
804ee207e3
|
Update _status_effects.dm
|
2019-11-25 22:52:19 -07:00 |
|
kevinz000
|
70ec955ef3
|
Update _status_effects.dm
|
2019-11-25 22:47:24 -07: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 |
|