cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-22 20:57:48 +01:00
Code Issues Packages Projects Releases Wiki Activity
38,600 Commits 8 Branches 0 Tags
machine-changes
Commit Graph
70 Commits
Author SHA1 Message Date
DeltaFire f892309903 fixes 2020-09-15 17:35:58 +02:00
lolman360andGitHub 6f7badda41 Merge branch 'master' into plumb 2020-08-12 09:03:11 +10:00
lolman360 49948e77a4 SELLYOULOSE 2020-08-11 18:08:40 +10:00
chrisbbbbbbb 758d540c9e Suture/Mesh Crafting 2020-08-09 20:33:40 +02:00
Hatterhat a7d1a0ea48 gauze! stacksizes! shit. 2020-08-07 18:40:46 -05:00
LinandGitHub c310b1a70e Merge pull request #12997 from silicons/lavastaff 
fixes medsprays, sutures/regenmesh, and lavastaves not respecting clickdelay (rip instant chemdump heal on self)
 2020-08-05 19:43:38 -05:00
silicons 20dea7e41f fix 2020-08-01 20:45:49 -07:00
Timothy TeakettleandGitHub 9721025582 Merge branch 'master' into wounds-part-2 2020-07-29 15:47:44 +01:00
Timothy Teakettle 7fb55a02a5 section one 2020-07-24 22:34:22 +01:00
silicons ffd44b78ba Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:26:03 -07:00
Timothy TeakettleandGitHub 75a2035774 Merge branch 'master' into wound-port 2020-07-21 01:10:51 +01:00
siliconsandGitHub 3d2995b4e8 Merge pull request #12787 from CameronWoof/advanced-sutures-and-mesh 
Ports Medicated Sutures and Advanced Regenerative Mesh from TG
 2020-07-20 17:01:32 -07:00
silicons 98d3ac80d9 :pika: 2020-07-20 11:25:17 -07:00
Timothy TeakettleandGitHub 1a5008fee7 Merge branch 'master' into wound-port 2020-07-18 23:06:49 +01:00
Timothy Teakettle 3b78ac58bd make it clearer 2020-07-18 22:46:07 +01:00
Timothy Teakettle de83bbee0b woops 2020-07-18 22:02:07 +01:00
timothyteakettle e8fade4f7f changes 2020-07-18 02:29:12 +01:00
timothyteakettle 584e74590f port1 2020-07-17 02:01:33 +01:00
CameronWoof a493ecdc4a suture and mesh additions 2020-07-15 16:44:24 -07:00
silicons 6ee63f66aa whew 2020-07-07 20:48:54 -07:00
SmArtKarandGitHub 170a38a3a7 Porting sutures and meshes from /TG/ (#12532) 
* Porting sutures and meshes from /TG/

* Recipes fix
 2020-06-16 16:22:56 -07:00
GhomandGitHub 8cb15f9279 Actually Balanced and Standardized Vendor Prices. (#12495) 2020-06-09 22:22:53 -07:00
Ghommie 7fb96ab0cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-05-12 20:06:59 +02:00
TrilbyspacecloneandGitHub 86fc39a777 le sigh 2020-05-07 17:55:25 -04:00
Ghommie a194d7dafe merge conflict and job/dept discounts support. 2020-05-03 02:11:05 +02:00
TrilbyspacecloneandGitHub 71e91a15b1 toxin healing bad I guess 2020-04-22 02:19:35 -04:00
TrilbySpaceClone 37a0fb558c with fixes and new gauze 2020-04-19 15:29:48 -04:00
Ghommie 4c6f1b622b Porting Goofconomy & co. 2020-04-17 07:48:11 +02:00
Artur fdc6a02eea Hm 2020-03-25 12:46:42 +02:00
Ghommie 95db5084ab Screw commit history. 2020-02-02 01:26:04 +01:00
AffectedArc07 16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Ghommie b4c0433d6d more work. 2019-12-27 17:45:19 +01:00
Ghommie 8bc277d38d Fills white first aid kits to the brim. Ergo how I was fooled into believing it was a tweak and not a nerf. 2019-12-22 11:40:25 +01:00
GhomandGitHub 7f0ae5dbde I gotta go fast. 2019-12-21 13:04:27 +01:00
loginsandylogoutandGitHub 491958475b fixed 2019-12-15 18:48:50 -06:00
loginsandylogoutandGitHub 2c08f7ac95 oops 2019-12-08 17:25:17 -06:00
loginsandylogoutandGitHub 1bae17a2de gauze 2019-12-08 17:24:12 -06:00
loginsandylogoutandGitHub 17782a8c87 ports refactor 2019-12-08 17:10:50 -06:00
loginsandylogoutGitHubGhom
 		c0e77f8fdf Update code/game/objects/items/stacks/medical.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-11-29 15:10:30 -06:00
Commandersand 36b0ef53a0 bruh 2019-11-29 14:49:29 -06:00
Commandersand 4c4935f155 yeet 2019-11-29 14:13:39 -06:00
Ghommie a650e1e411 Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness" 2019-11-05 05:37:28 +01:00
Poojawa 65a89030eb reverts the bleed changes till they can be better tuned 2019-09-12 00:14:26 -05:00
Poojawa 4408d1b684 Gauze fully stops bleed rate on application 2019-09-11 05:54:17 -05:00
Poojawa b2252a1c74 Medical assistance treats bleed_rate to stop phantom bleeding 2019-08-30 02:46:57 -05:00
Poojawa 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
TrilbyspacecloneandGitHub bbb380e043 Update medical.dm 2019-07-31 09:03:27 -04:00
Poojawa d8312ec5ae Medical belt overlays + hypo storage 2019-04-04 18:38:34 -05:00
Poojawa 42db44b39e Alien Ruin fix, various cherrypicked upstream fixes 
Also adds new buildmode
 2018-09-13 22:55:11 -05:00
deathride58 91805b8789 and that just leaves the modules folder 2018-07-02 00:28:51 -04:00