 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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
Artur
|
9773b530f8
|
More fixes. Urgh
|
2019-12-08 21:47:25 +02:00 |
|
|
Artur
|
f48d8016d5
|
Merge remote-tracking branch 'upstream/master' into Bloodsuckers
|
2019-12-01 13:51:57 +02:00 |
|
|
Putnam3145
|
44c621e5e9
|
Merge pull request #9895 from Thalpy/OrganQoL
[READY] Organ quality of life fixes. Adds Organ fridges with items, Tweaks scanner, new surgery, tweaks chems
|
2019-11-30 22:22:52 -08:00 |
|
|
Artur
|
02048ce009
|
Bludsuckers
|
2019-11-29 21:28:14 +02: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 |
|
|
Fermi
|
e6ecabe54c
|
Scanner
|
2019-11-26 23:23:29 +00:00 |
|
|
Fermi
|
ca2467ff93
|
Thingie
|
2019-11-26 23:14:14 +00:00 |
|
|
Fermi
|
c5e6cb8ac0
|
space
|
2019-11-26 04:08:10 +00:00 |
|
|
Fermi
|
69e0f6836a
|
Adds a lil message so people don't spend 25 minutes trying everything
|
2019-11-26 04:05:43 +00:00 |
|
|
Thalpy
|
7b17bf2acd
|
god damn bitflags ARGH
|
2019-11-21 20:30:49 +00:00 |
|
|
Thalpy
|
7460c28b60
|
Merge branch 'OrganQoL' of https://github.com/Thalpy/Citadel-Station-13 into OrganQoL
|
2019-11-21 19:39:58 +00:00 |
|
|
Thalpy
|
0cce3a01f4
|
Ghommie's requiem
|
2019-11-21 19:39:55 +00:00 |
|
|
Thalpy
|
a0a52018f3
|
Apply suggestions from code review
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2019-11-21 19:06:34 +00:00 |
|
|
Thalpy
|
da1da717d2
|
Update code/game/objects/items/devices/scanners.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2019-11-21 19:03:48 +00:00 |
|
|
Thalpy
|
bd07ff4bf7
|
This should be the one!
|
2019-11-21 18:55:43 +00:00 |
|
|
Fermi
|
b911fabb37
|
Okay bedtime
|
2019-11-21 04:25:25 +00:00 |
|
|
Fermi
|
b90213882e
|
Again with the rouge
|
2019-11-21 03:58:16 +00:00 |
|
|
Fermi
|
01f465dc8c
|
Scanner formatting
|
2019-11-21 03:52:00 +00:00 |
|
|
Fermi
|
18e1246fd0
|
Classic fixes
|
2019-11-21 03:16:18 +00:00 |
|
|
Fermi
|
cc53a0061f
|
Well it compiles
|
2019-11-21 02:15:58 +00:00 |
|
|
Ghommie
|
a52e292cc8
|
Ports "examine-code refactor"... part 1...
|
2019-11-19 03:28:06 +01:00 |
|
|
Ghommie
|
1e49ce76d3
|
Dreamchecker compatibility changes, part 1.
|
2019-11-10 20:48:30 +01:00 |
|
|
Poojawa
|
d8e0771dcd
|
Better Health Analyzer formatting
Because having it all bunched up is a pet peeve.
|
2019-11-02 23:14:39 -05:00 |
|
|
Poojawa
|
3113074bfb
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-08 02:55:32 -05:00 |
|
|
Thalpy
|
564c1fde9f
|
Merge branch 'master' into Reagents_bitflats
|
2019-10-08 07:31:03 +01:00 |
|
|
kevinz000
|
0073d99a22
|
Merge pull request #9309 from Thalpy/tg-Organ-port
[READY][SUCCESSFULLY TESTMERGED] Ports TG's organ handling (with a few tweaks to make it fit).
|
2019-10-07 23:29:19 -07:00 |
|
|
Thalpy
|
27c2c89766
|
Merge branch 'master' into Reagents_bitflats
|
2019-10-05 23:43:19 +01:00 |
|
|
Poojawa
|
0482973e8f
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-01 22:38:12 -05:00 |
|
|
Fermi
|
f83de63124
|
Kev's scanner malarky
|
2019-09-28 17:51:55 +01:00 |
|
|
Poojawa
|
041a4b4ed1
|
Corrects scanner measurment information
|
2019-09-28 03:18:00 -05:00 |
|
|
Fermi
|
d12fd72ebf
|
Updates a buncha stuff.
|
2019-09-20 21:11:20 +01:00 |
|
|
Fermi
|
9b2f67d67d
|
reagent_flags is used elsewhere, renamed to chemical_flags
|
2019-09-20 19:43:37 +01:00 |
|
|
Fermi
|
3f2933adbf
|
Ghommies' requests.
|
2019-09-19 23:31:36 +01:00 |
|
|
Fermi
|
7ef5ab0332
|
TO TEST - also needs #9099 merging.
|
2019-09-19 17:52:45 +01:00 |
|
|
Fermi
|
107dd67cbe
|
Well it compiles; just synthtissue and TongueLoss now.
|
2019-09-19 01:14:12 +01:00 |
|
|
Fermi
|
c23d6f0113
|
I missed an earlier port.
|
2019-09-17 01:08:37 +01:00 |
|
|
Poojawa
|
b29607c019
|
It's working again, I guess. wtf
|
2019-08-21 01:36:59 -05:00 |
|
|
Fermi
|
02b5100be7
|
Made scans advanced.
|
2019-08-09 13:01:14 +01:00 |
|
|
Fermi
|
6e0303fdba
|
Actual fix for #9091
|
2019-08-09 12:48:26 +01:00 |
|
|
Fermi
|
34cfd2c1e3
|
Fix for #9091
|
2019-08-09 12:12:25 +01:00 |
|