 BlackMajor
|
375e59a77d
|
Merge branch 'master' into Yeehaw
|
2019-12-29 22:12:40 +13:00 |
|
|
BlackMajor
|
206a5e168a
|
More mining changes
|
2019-12-29 20:15:49 +13:00 |
|
|
Ghommie
|
37441437d1
|
a
|
2019-12-28 23:02:28 +01: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 |
|
|
Seris02
|
862acf2f06
|
ports hyper's genetics
|
2019-12-28 21:33:15 +08:00 |
|
|
Ghommie
|
21cfb2914b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2019-12-27 17:49:59 +01:00 |
|
|
Ghommie
|
b4c0433d6d
|
more work.
|
2019-12-27 17:45:19 +01:00 |
|
|
BlackMajor
|
4e1a9b83cf
|
Pushing work for tonight.
|
2019-12-28 01:01:26 +13:00 |
|
|
Ghommie
|
53d142b4c0
|
more work.
|
2019-12-25 01:34:33 +01:00 |
|
|
Hatterhat
|
681508482c
|
magazine metal cost tweaks, speedloader in AIB
|
2019-12-24 04:15:25 -06:00 |
|
|
Ghommie
|
e74339ce8b
|
Jfc that's a lot of work!
|
2019-12-23 04:24:13 +01:00 |
|
|
Trilbyspaceclone
|
0b63e79098
|
Merge branch 'master' into glassware
|
2019-12-21 15:41:45 -05: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 |
|
|
Seris02
|
61ab3685f1
|
atmos firelock, changes to temp blocking
|
2019-12-20 14:14:01 +08: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 |
|
|
Trilbyspaceclone
|
ddd3676903
|
Merge branch 'master' into glassware
|
2019-12-17 15:18:30 -05: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
|
651370c5b4
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit450
|
2019-12-11 21:10:24 +01:00 |
|
|
Ghommie
|
19a3aca619
|
I fear for my powernet
|
2019-12-10 15:33:15 +01: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 |
|
|
TrilbySpaceClone
|
e5c8f7bf06
|
Merge branch 'master' into glassware
|
2019-12-07 12:50:32 -05: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 |
|
|
Ghommie
|
91e628c73d
|
Ports timestop and sepia extracts improvements/tweaks.
|
2019-12-06 19:01:42 +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 |
|