cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-22 12:47:43 +01:00
Code Issues Packages Projects Releases Wiki Activity
38,600 Commits 8 Branches 0 Tags
machine-changes
Commit Graph
5544 Commits
Author SHA1 Message Date
Enric Gabriel d505bf0716 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-06-28 13:33:22 -03:00
Ghommie a34a7ba5d4 You can't (un)equip garments on/from obscured inventory slots anymore. 2020-06-28 01:10:22 +02:00
siliconsandGitHub 2ab69c0170 Merge pull request #12603 from b1tt3r1n0/Pouches(again) 
Some edits to pouches, and something that can hold sheets.
 2020-06-27 14:54:57 -07:00
siliconsandGitHub 45a6061958 Merge pull request #12596 from Ghommie/Ghommie-cit819 
Porting further material datum features and improvements.
 2020-06-27 14:53:28 -07:00
siliconsandGitHub 8b04fd70de Merge pull request #12615 from Ghommie/Ghommie-cit821 
Solving several issues.
 2020-06-27 14:52:59 -07:00
GhomandGitHub 58778f2e6e Merge pull request #12619 from timothyteakettle/what-if-blood-didnt-suck 
slimes blood colour is their body colour
 2020-06-27 22:14:17 +02:00
silicons 1d4a54d880 log 2020-06-26 23:47:16 -07:00
silicons 0df5aa083b policies and code hooks 2020-06-26 23:41:44 -07:00
timothyteakettle b94267e1e1 more spellchecks 2020-06-27 02:41:50 +01:00
timothyteakettle 76b5557e1e bunch of grammar corrections 2020-06-27 02:12:44 +01:00
Timothy Teakettle 334d55bef3 add support for custom blood colours 2020-06-26 20:29:40 +01:00
Ghommie 8f6b31c26e Solving several issues. 2020-06-26 18:40:20 +02:00
Artur 765ffdb1a1 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-26 14:03:27 +03:00
Enric Gabriel fda9b1be3d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-06-26 00:28:33 -03:00
siliconsandGitHub a2a1ae3a2c Merge pull request #12592 from timothyteakettle/felinids-nya-when-tabled 
felinids nya when tabled
 2020-06-25 18:33:34 -07:00
siliconsandGitHub 54c8d58e52 Update clown_items.dm 2020-06-24 23:20:51 -07:00
b1tt3r1n0 a780b9037c Some edits to pouches, and something that can hold sheets. 
Title. Vendor edits and a minor engineering addition for those who want to hold sheets and shit.
 2020-06-24 23:07:56 -04:00
Ghommie fe3932a36e Fixing the snore-pocalypse, and another not so critical issue. 2020-06-24 23:08:40 +02:00
Ghommie c5cbfa64e5 Porting further material datum features and improvements. 2020-06-24 20:45:17 +02:00
Timothy Teakettle b83c428744 Update tables_racks.dm 2020-06-24 14:37:08 +01:00
Ghommie ae053a9a08 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit800 2020-06-23 03:12:49 +02:00
Ghommie de77b7139c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-23 00:13:14 +02:00
Artur c41d2e78be Conflicts!!! 2020-06-22 17:39:24 +03:00
Enric Gabriel 776b763e17 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-06-22 07:03:48 -03:00
LinandGitHub 2cd18f3dba Merge pull request #12557 from silicons/life 
Splits Life() into procs for physical and biological life processes in preparation for stasis beds
 2020-06-21 18:32:58 -05:00
siliconsandGitHub 99a7c49e52 Merge pull request #12561 from shellspeed1/Ports-kyro-chems 
Ports IV bags from TG
 2020-06-21 14:11:10 -07:00
Ghommie 29a8d2ed78 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit813 2020-06-20 00:07:47 +02:00
shellspeed1 9197cb4813 allows storage in medbelts and organ boxes. 2020-06-18 21:06:22 -07:00
Enric Gabriel 89947284dd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-06-18 21:17:24 -03:00
kevinz000 1b5ea90c8f sigh 2020-06-18 08:16:05 -07:00
shellspeed1 b490f02c78 Ports IV bags from TG 
Ports the iv bag portion of https://github.com/tgstation/tgstation/pull/44531/files from tg.
 2020-06-18 02:30:58 -07:00
kevinz000 445d94f335 haha whew 2020-06-17 21:32:10 -07:00
Enric Gabriel d6e4eb9de3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-06-18 00:28:18 -03:00
kevinz000andGitHub 118ac1a775 Merge pull request #12548 from timothyteakettle/more-events 
ports several tg events including fugitives
 2020-06-17 20:10:04 -07:00
Enric Gabriel cb261a1b74 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-06-17 20:23:21 -03:00
Timothy TeakettleandGitHub 2229db2214 Merge branch 'master' into embed-changes 2020-06-17 16:40:34 +01:00
kevinz000andGitHub 2e943e03a3 Merge pull request #12544 from SmArtKar/bee_shuttles 
Shuttles from beestation
 2020-06-17 08:35:34 -07:00
TrilbyspacecloneandGitHub 51da7dfa71 Merge branch 'master' into spike-loot-differentces 2020-06-17 02:36:52 -04:00
Enric Gabriel 951ded8258 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-06-16 23:28:12 -03:00
SmArtKarandGitHub 29ff6fc464 Updating ID Icons (#12535) 
* Mid-process

* ID updates
 2020-06-16 16:23:17 -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
Timothy Teakettle 2d1d2eeda6 final fixes 2020-06-16 23:47:22 +01:00
SmArtKar 46c3e9e54d Shuttles 2020-06-16 18:16:14 +03:00
timothyteakettle b59c8c1af6 fix maps 2020-06-16 02:44:11 +01:00
timothyteakettle 002fa1da1d how did i fuck that up 2020-06-16 00:34:28 +01:00
Timothy Teakettle eba1e8f301 fixes the merge conflicts 2020-06-15 23:29:49 +01:00
Artur ceba739231 Cooonflicts 2020-06-16 01:23:42 +03:00
Timothy Teakettle 7fbfb4ad0e Merge remote-tracking branch 'upstream/master' into embed-changes 2020-06-15 22:48:26 +01:00
Enric Gabriel 18faedfc1a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-06-15 17:36:27 -03:00
Timothy Teakettle d7bce8aec0 ports some events 2020-06-15 20:22:40 +01:00