Commit Graph

177 Commits

Author SHA1 Message Date
SiliconMain e11dab552f it just werks 2020-07-26 16:28:21 -05:00
SiliconMain fdaa4b4372 aaaaaaaaaaa 2020-07-26 16:07:48 -05:00
SiliconMain ad420c6633 AAAAAAAAAAAA 2020-07-26 15:53:08 -05:00
SiliconMain abdafe15fa fuck 2020-07-26 15:21:24 -05:00
Timothy Teakettle 93b4570f8d more changes 2020-07-17 23:23:47 +01:00
timothyteakettle 584e74590f port1 2020-07-17 02:01:33 +01:00
Putnam a625d6562b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-07-08 22:02:03 -07:00
kevinz000 0e58938253 Update scanners.dm 2020-06-10 14:42:27 -07:00
Ghom 8cb15f9279 Actually Balanced and Standardized Vendor Prices. (#12495) 2020-06-09 22:22:53 -07:00
Putnam 8458f97692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-05-12 13:34:31 -07:00
Putnam e8d7da56f4 Ported C++mos from yogs (help me) 2020-05-11 15:44:26 -07:00
Ghommie b2a20d5438 reducing some prices as training wheel. 2020-05-03 05:37:04 +02:00
Ghommie a194d7dafe merge conflict and job/dept discounts support. 2020-05-03 02:11:05 +02:00
Ghommie 4c6f1b622b Porting Goofconomy & co. 2020-04-17 07:48:11 +02:00
Ghommie af55880794 Fixes and standarizes a few liver troubles. Re-enables liver failure. 2020-04-10 17:22:34 +02:00
Putnam 443af96126 Changed how scanners show organ damage. 2020-04-05 03:25:04 -07:00
Seris02 ea8941343e stops validhunting geneticists from knowing exactly who is an is a vampire (and allows vampires genes) (#11520)
* yeet gone

* pfft oof

* oof
2020-03-19 13:40:11 +01:00
kevinz000 69c21f4b76 Merge pull request #10327 from Seris02/tggenetics
ports tg genetics
2020-03-11 17:01:37 -07:00
Ghommie 27a7f754c4 Fix runtimes some more. 2020-03-10 22:40:06 +01:00
Seris02 cccd0e9eef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-03-09 16:49:32 +08:00
Seris02 68f15e16e7 fixed 2020-02-22 20:06:35 +08:00
Seris02 c3ec44b0d0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-02-22 19:54:10 +08:00
Seris02 84d08fe122 firebreath change + update to tg genetics + calc patch 2020-02-22 19:42:33 +08:00
kevinz000 f6542b381c Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-21 23:29:25 -07:00
Seris02 ee7064840d merge conflicts fixed finally 2020-02-05 18:42:16 +08:00
kevinz000 6a8a606f97 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-04 16:01:25 -07:00
Ghommie a726f09201 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-04 03:54:52 +01:00
Ghom 6f66d76680 Merge pull request #10705 from kevinz000/revert_poojawa_blood_1
Cleanup/Partial revert of RGB blood ""rework""
2020-02-02 19:08:57 +01:00
Ghom ee533da3d7 Putting GLOB.blood_reagent_types at use. 2020-02-02 18:34:14 +01:00
kevinz000 e97af26236 ok ghom 2020-02-02 01:37:11 -07:00
Ghommie 95db5084ab Screw commit history. 2020-02-02 01:26:04 +01:00
Ghommie 188f726ffd unicode support port wip 2020-01-31 05:32:00 +01:00
kevinz000 4376434e01 woops 2020-01-24 22:31:05 -07:00
kevinz000 b33e6cd79e scanner fix 2020-01-24 22:00:03 -07:00
Seris02 718ff58e0b fixes + advanced injectors 2020-01-19 15:17:57 +08:00
kevinz000 7bcb37c5d1 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-16 21:12:56 -07:00
Seris02 cb3a4caa63 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-01-14 23:42:37 +08:00
Putnam 21dde64da2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into chemistry-aaa 2020-01-14 03:27:03 -08:00
Seris02 16b5c83a3a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-01-13 12:53:52 +08:00
kevinz000 b341818f04 mobility flags 2020-01-12 11:00:12 -08:00
AffectedArc07 16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Putnam 38dcb78625 chemistry fixes 2020-01-11 18:15:50 -08:00
Seris02 ac4489c6a8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-01-11 13:55:29 +08:00
kevinz000 9cec806875 Update scanners.dm 2020-01-10 12:48:55 -08:00
kevinz000 7392760f38 Update scanners.dm 2020-01-10 12:48:19 -08:00
Seris02 862acf2f06 ports hyper's genetics 2019-12-28 21:33:15 +08:00
Ghommie 57cecd2499 work 2019-12-25 06:54:44 +01:00
Ghommie 53d142b4c0 more work. 2019-12-25 01:34:33 +01:00
Ghommie e74339ce8b Jfc that's a lot of work! 2019-12-23 04:24:13 +01:00
Putnam3145 c39a5d0462 Merge pull request #10011 from Arturlang/Bloodsuckers
Bloodsuckers, or, yknow, vampires.
2019-12-15 14:41:36 -08:00