Commit Graph

84 Commits

Author SHA1 Message Date
Ghommie
4a621fb1aa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit560 2020-02-14 19:39:53 +01:00
Ghommie
0703c6eea6 First tweak to cargo reagents selling. 2020-02-06 22:34:54 +01:00
ancientpower
335c28ff25 fixes for the requested changes 2020-02-04 17:02:13 -06:00
ancientpower
a85f05a628 requested changes 2020-02-04 16:58:24 -06:00
ancientpower
0d6ffbc432 fixed it for real this time 2020-02-04 16:38:20 -06:00
ancientpower
9dd411f11b fixes the restoration for reals 2020-02-04 16:11:12 -06:00
ancientpower
524836c2b2 restores drink flinging 2020-02-04 15:48:03 -06:00
ancientpower
937f6356ab vgstation drink sliding 2020-02-02 13:26:16 -06:00
Ghommie
41ee00b7df Refactoring APTFT altclick/verb options into flags 2020-01-26 18:53:16 +01:00
Ghommie
bd6e364612 But wait, there is more!
No...
2020-01-24 04:33:55 +01:00
Ghommie
9c0b78bc09 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-18 01:23:08 +01: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
Ghommie
c14439494a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-12 19:18:03 +01: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
Ghommie
c9375a1288 Fixes reagent containers examination. 2020-01-10 14:19:22 +01:00
Ghommie
825b4f01c2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-10 02:26:19 +01:00
Ghommie
75d47c2a0d Improves the set_APTFT verb into a proc. 2020-01-05 23:51:42 +01:00
Hatterhat
e65583c403 set_AFTFT verb, tweaking shit 2020-01-04 00:44:01 -06:00
Ghommie
37441437d1 a 2019-12-28 23:02:28 +01:00
Ghommie
e74339ce8b Jfc that's a lot of work! 2019-12-23 04:24:13 +01:00
Ghommie
9db79ff958 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-12-20 23:40:21 +01:00
Fermi
a0539c79e9 Fixa da goof 2019-11-07 00:03:46 +00:00
Fermi
37bfb31ee0 Merge branch 'master' into Superbases-goodbye 2019-11-01 00:55:55 +00:00
Thalpy
642b27a10f Ghommie 2019-11-01 00:26:22 +00:00
Ghommie
5fcf5b1c5e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-10-29 13:38:16 +01:00
Ghommie
2c578ca683 Ports move force and move resist, movement/pushing/pulling tweaks & co. 2019-10-24 18:01:46 +02:00
Thalpy
7ace15d846 oops 2019-10-21 20:58:15 +01:00
Thalpy
36357b3280 Eh this way is probably better. 2019-10-21 19:54:44 +01:00
Thalpy
805079b62c Goodbye, superpH, you were too wild for our world. 2019-10-21 19:44:52 +01:00
Poojawa
117e5a409d Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-01 00:05:44 -05:00
Fermi
3f7c657111 Plate and pH (pHlate) 2019-09-27 12:01:03 +01:00
Fermi
bbe6b4ab15 Okay! Should be good. 2019-09-22 02:43:12 +01:00
Fermi
0dcdede8fa In response to poll and feedback. 2019-09-22 02:28:59 +01:00
Poojawa
32c7a7c3ee Virology's broken as fuck, damnifino why 2019-08-21 03:36:40 -05:00
Thalpy
7be7f05228 Reduced pent, tweaked pH, tweaked MK, added beaker tally. 2019-06-29 08:50:20 +01:00
Thalpy
f8a93a035f Tweaking pH based on user feedback. 2019-06-29 07:32:00 +01:00
Fermi
3928e027b4 Fixes (see dev discussion) 2019-06-25 23:06:55 +01:00
Fermi
be36a8bb33 Cleanup 2019-06-15 18:04:06 +01:00
Fermi
79d176336c A few minor fixes. 2019-06-15 11:36:38 +01:00
Fermi
6b9becce71 Merge branch 'pr/14' 2019-06-14 21:29:04 +01:00
Fermi
aa1cb22edc Eigenstate fixes. 2019-06-14 16:26:08 +01:00
Fermi
2365f7337c Adventures in bitflags! 2019-06-14 12:47:22 +01:00
Fermi
e95b371ea5 Changed to weakness 2019-06-14 11:56:28 +01:00
Fermi
d6edc8db1f Preweakeness 2019-06-14 11:43:01 +01:00
Fermi
ab35b018db Indents and eigenstate var reduction. 2019-06-14 11:24:21 +01:00
Fermi
ee458b102f bitflags 2019-06-14 10:45:36 +01:00
Fermi
2a76cfa285 Logging 2019-06-13 07:51:46 +01:00
Fermi
54985c05d9 Confused about bitgates. 2019-06-13 07:11:29 +01:00
Fermi
c9a66544bc pH and temp immune bitflagging. 2019-06-13 06:45:29 +01:00