c81d1fe7a3
Merge pull request #9867 from Ghommie/Ghommie-cit375
...
Ports "examine-code refactor"
2019-11-25 11:31:03 +13:00
6f98efb18e
Merge pull request #9902 from Useroth/new-tg-plants
...
[TESTMERGE READY] Ported a bunch of tg hydroponics content.
2019-11-25 11:30:43 +13:00
2ced7db508
Ported a bunch of tg hydroponic stuff.
2019-11-21 10:53:57 +01:00
a52e292cc8
Ports "examine-code refactor"... part 1...
2019-11-19 03:28:06 +01:00
05c74c731b
Ports TG pew files
2019-11-17 14:20:44 +00:00
ec57e28c17
Merge branch 'master' into Cargo_MKII
2019-11-13 08:00:24 -05:00
6e328ea1b1
art of the deal
2019-11-11 07:26:12 -05:00
0662245d80
corrections
2019-11-06 22:52:44 -05:00
a650e1e411
Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness"
2019-11-05 05:37:28 +01:00
9af899c9c3
cleaning up
2019-11-03 12:59:41 -05:00
63cb466360
MK II
2019-10-26 18:59:34 -04:00
a50606bb67
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit259
2019-10-24 10:10:07 +02:00
e1928a18f1
Porting GetComponent macros removal, and some related changes.
2019-10-23 15:04:28 +02:00
394c947d14
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-10-11 23:10:45 -05:00
293034d815
Imagine Updating How Tables Work, But Forgetting MY TABLES
...
## About The Pull Request
Let me just add in a single line so plasmaglass tables actually work.
## Changelog
🆑
fix: You can now make plasmaglass tables again.
/🆑
2019-10-10 09:04:06 -06:00
0c9a065096
Merge pull request #8401 from Ghommie/Ghommie-cit11
...
Refactoring Implants' loc n°3
2019-10-10 02:09:37 -07:00
3113074bfb
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-10-08 02:55:32 -05:00
32a73b24c0
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11
2019-10-05 18:22:43 +02:00
6d9aa8de70
More carpet options and ways to get them
2019-10-03 22:54:10 -05:00
53895106dc
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-13 12:58:02 -05:00
65a89030eb
reverts the bleed changes till they can be better tuned
2019-09-12 00:14:26 -05:00
4408d1b684
Gauze fully stops bleed rate on application
2019-09-11 05:54:17 -05:00
0cf1415969
[SPEEDMERGE] Glass Machine :b:roke
2019-09-05 16:28:18 +01:00
b2252a1c74
Medical assistance treats bleed_rate to stop phantom bleeding
2019-08-30 02:46:57 -05:00
19678119c5
Merge branch 'plasmatables' into plasmaglass-tables-spears
2019-08-28 14:55:01 -06:00
9558252b93
Revert/replaces a lot of #8024 with bleed_rate
...
Wearing armor reduces the blood loss you incur, no longer are you instantly deleted on blood. Dripping blood WILL kill you if you don't solve that issue, medical gauze has been tripled as a QoL for medical staff as a result.
2019-08-26 14:22:17 -05:00
f104ba1f90
Plasmaglass Spears and plasmaglass actually drops plasma shards!
2019-08-25 21:38:04 -06:00
96834bc517
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-20 03:36:17 -05:00
088bc484e3
Forensics re-destroyed, but better this time.
...
All lists are LAZYINITLIST, cleaning code is preserved, examine is preserved. We should be back in buisness, but this is just a 'holy fuck finally' commit
2019-08-17 02:43:59 -05:00
7d12535ead
thanks paxxy boi
2019-08-17 12:18:18 +10:00
264cbf8108
reverts the add_blood back to add_blood_DNA
2019-08-15 12:49:10 -05:00
0290a46ddc
Impliments Ghom review, reverts blood list back to component
2019-08-15 12:32:44 -05:00
aa71a39fa8
so basically im monky
2019-08-11 11:13:38 +10:00
283b5d050e
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-08 16:51:53 -05:00
9ec56077b6
Merge pull request #8908 from Ghommie/Ghommie-cit142
...
Fixes Zelus flasks a bit.
2019-08-05 00:54:43 -07:00
86a2d917e5
Merge pull request #8913 from Trilbyspaceclone/clockstoles
...
Makes brass/bronze bar stools and stools - Same as normal ones
2019-08-05 00:45:56 -07:00
27b3cb6656
Merge pull request #9018 from Ghommie/Ghommie-cit171
...
Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"
2019-08-04 19:04:59 -07:00
3499d73f6b
Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods
2019-07-31 19:24:39 -05:00
ec2a3ea778
Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"
2019-07-31 18:56:00 +02:00
bbb380e043
Update medical.dm
2019-07-31 09:03:27 -04:00
589cdae0e1
Towels
2019-07-18 00:03:49 +02:00
ba63926905
Sitting on the job
2019-07-16 22:42:57 -04:00
0d1988b6be
More fixes.
2019-07-16 16:10:16 +02:00
75a8cbcc39
Makes Zelus flasks a subtype of bottle.
2019-07-16 15:39:30 +02:00
fac3e65c68
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11
2019-07-15 17:42:47 +02:00
54c28b19af
Zelus indeed
2019-07-10 02:29:42 -04:00
d218739bf8
Merge pull request #8740 from Ghommie/Ghommie-cit87
...
ports "More variety for dorms bedsheets" + 3 new bed sheets.
2019-07-08 18:06:11 -04:00
fd68236594
ports "More variety for dorms bedsheets" + 3 new bed sheets.
2019-06-24 05:54:14 +02:00
2e30b91567
Ports in microwave updates and its radial menu.
2019-06-23 06:10:49 +02:00
27d7dc430f
Merge pull request #8497 from BurgerLUA/Clockwork-Reflectors
...
Adds Clockwork Reflectors
2019-06-16 19:41:57 -07:00
BlackMajor