3113074bfb
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-10-08 02:55:32 -05: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
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
ab565d2483
Merge pull request #8547 from Ghommie/Ghommie-cit29
...
Moves traits to datums and turn the accessors into defines
2019-06-08 01:22:16 -07:00
d3d2b8d898
should be ready.
2019-06-06 19:24:20 +02:00
1f1f951924
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-06-03 05:35:52 -05:00
aaaebe625b
old file fixes
2019-05-31 18:00:00 -04:00
3891cf1ff6
Update sheet_types.dm
2019-05-31 17:54:49 -04:00
5f94441cc7
Adds Clockwork Reflectors
2019-05-30 22:52:43 -07:00
070e43ca64
Update sheet_types.dm
2019-05-25 17:58:33 -04:00
ed974bdcde
Update sheet_types.dm
2019-05-25 17:18:40 -04:00
971ddef989
reverts forensics components. If I can't figure it out, MURDER IT
2019-05-22 04:10:29 -05:00
4aba11739b
Finishing touches.
2019-05-10 19:15:42 -07:00
d97bf47b95
Added
2019-05-10 18:12:36 -07:00
d8312ec5ae
Medical belt overlays + hypo storage
2019-04-04 18:38:34 -05:00
7db87db43a
fancier throws, fancier bullet casings, fancier window destruction, fancier bottle smashing ( #7997 )
2019-02-13 21:02:00 -08:00
1034a6ad0e
ball stuff
2018-12-16 03:41:37 -08:00
629189fdc1
Added Another new carpet, and two tables, and a new cargo crate.
...
Added: monochrome. Two new table sprites for the other new carpet. New cargo supply crate for the two new carpets. Changed: the name of the new carpet to "blackred" so it would avoid confusion with the original carpet.
2018-12-07 22:48:46 -06:00
e339bcd2ca
Added a new carpet
...
Worked on adding a new carpet. It isn't -finished- yet and Trilby is going to help look over what I've done so I can make this work.
2018-12-01 20:21:18 -06:00
42db44b39e
Alien Ruin fix, various cherrypicked upstream fixes
...
Also adds new buildmode
2018-09-13 22:55:11 -05:00
8b9ef1e400
Game folder
2018-09-11 04:06:45 -05:00
Poojawa