95c0eddc2a
Merge pull request #10072 from Useroth/new-tg-plants
...
Ported bamboo stuff from tg.
2019-12-18 01:02:29 +13:00
c39a5d0462
Merge pull request #10011 from Arturlang/Bloodsuckers
...
Bloodsuckers, or, yknow, vampires.
2019-12-15 14:41:36 -08:00
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
4711eb0987
Merge remote-tracking branch 'upstream/master' into Bloodsuckers
2019-12-07 15:53:11 +02:00
28ddfd29b6
Merge branch 'master' into new-tg-plants
2019-12-07 14:25:38 +01:00
5f56d40f58
Incorporated the bamboo grammar fixes.
2019-12-07 06:41:24 +01:00
19ab4a5f70
Review fixes and tweaks
2019-12-07 00:43:02 +02:00
1158c03ed7
Added bamboo.
2019-12-06 19:00:10 +01:00
8bd6c58bcd
Merge branch 'master' into cargocleanupv2boogaloo
2019-12-06 01:27:44 -05:00
b860c6e0bb
Merge branch 'master' into cargocleanupv2boogaloo
2019-12-06 01:14:44 -05:00
a65588009c
Merge pull request #10038 from Trilbyspaceclone/patch-240
...
Makes trash carts craftable with plastic
2019-12-05 21:51:30 -07:00
e2f9a68c2c
Merge pull request #10049 from Useroth/new-tg-plants
...
Colored fairy grass, because fuck your eyes.
2019-12-05 21:43:24 -07:00
2e84c30e59
Tiny touch-ups
2019-12-05 16:29:50 +01:00
82d1497ddc
Fixes bad buds and toxin healing
2019-12-05 17:29:00 +02:00
950b884da5
Adds colored fairygrass.
2019-12-05 01:47:42 +01:00
aa3598f166
less dope
2019-12-03 19:51:19 -05:00
0b90def435
Update sheet_types.dm
2019-12-03 19:43:31 -05:00
3b8aebbbc2
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
2019-11-29 00:40:16 +01:00
6a4c959b0a
Added more crates.
2019-11-24 19:05:03 -05:00
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
05b22caaa3
Added 12 new crates, fixed issues raised in #9901
...
Remake of previous PR that I broke due to inexperiance.
Added 12 new crates to cargo.
Re-ordered some some of the crates.
2019-11-22 02:37:57 -05: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
BlackMajor