cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-07-21 13:14:10 +01:00
Code Issues Packages Projects Releases Wiki Activity
38,600 Commits 8 Branches 0 Tags
machine-changes
Commit Graph

1757 Commits

Author SHA1 Message Date
Enric Gabriel d2257abe86 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-19 13:21:18 -03:00
Ghom 868e464b40 fixes linter issues, removes acid degrading armor (#13399) 
* fix

* more

* Update brawn.dm

* Update ticketmachine.dm
 2020-09-19 15:04:48 +02:00
Enric Gabriel d85ebed8db Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-16 16:22:36 -03:00
silicons ca8b13b86a Merge pull request #13255 from timothyteakettle/limbs 
you can choose limbs to be prosthetic/amputated
 2020-09-16 00:31:18 -07:00
silicons 95ebeac5b6 fix 2020-09-15 17:27:11 -07:00
Enric Gabriel 38c0f8efbd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-07 18:21:54 -03:00
silicons 07b28f40de Merge pull request #13359 from Ghommie/Ghommie-cit838 
Turf visuals fix plus corrected names of a couple things.
 2020-09-07 13:42:05 -07:00
Ghommie 4a04b22b72 Turf visuals fix plus corrected names of a couple things. 2020-09-06 18:53:01 +02:00
Enric Gabriel 499fec6a16 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-06 10:42:43 -03:00
BlackMajor 1943a2fdd7 Merge pull request #13246 from silicons/anomaly_manufacturing 
anomaly manufacturing port from tg. supermatter anomaly generation nerfed to 20% rather than removed
 2020-09-06 17:53:35 +12:00
timothyteakettle cdaef63fa1 sorry travis 2020-09-03 23:07:19 +01:00
timothyteakettle 90eef6efc9 Merge remote-tracking branch 'upstream/master' into limbs 2020-09-03 22:46:32 +01:00
timothyteakettle 9e2ee588c9 rp prosthetics 2020-09-03 22:05:21 +01:00
Enric Gabriel c10471fac9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-30 01:42:29 -03:00
Letter N fe17bee28e reverts thing kev said about 2020-08-29 14:36:41 +08:00
Letter N ae482c1bb8 Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT 2020-08-29 14:09:56 +08:00
Timothy Teakettle fe25046410 Merge branch 'master' into limbs 2020-08-27 18:06:35 +01:00
Enric Gabriel 45c5d5d81d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-25 16:06:57 -03:00
silicons 973839dee4 ports my baystruments updates from tg (#13219) 
* subsystem

* fix

* e

* update

* fix
 2020-08-25 21:04:42 +02:00
timothyteakettle cd7293a9a2 limbs 2020-08-24 03:19:36 +01:00
silicons bd5766a8be changes 2020-08-23 05:27:53 -07:00
Enric Gabriel f759503b49 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-22 20:30:49 -03:00
silicons 7737e76b32 Merge pull request #13224 from Ghommie/Ghommie-cit835 
Removing priority overlays, update_icon() splitup for guns.
 2020-08-22 15:19:07 -07:00
Letter N 0b159b218a revert moment 2020-08-22 16:30:56 +08:00
Letter N afe32406c0 Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT 2020-08-22 13:40:36 +08:00
Enric Gabriel b0662f5e39 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-21 02:19:20 -03:00
silicons 120bcfc00c Merge pull request #13178 from lolman360/plumb 
[READY] ports plumbing (no more waiting for tgui4)
 2020-08-20 21:32:26 -07:00
Ghommie fde859bca0 Removing priority overlays, update_icon() splitup for guns. 2020-08-20 18:33:23 +02:00
Enric Gabriel b0cf18fc5a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-20 13:29:24 -03:00
Letter N 2dd3d71b19 config&copypaste chang. 2020-08-20 16:36:24 +08:00
Letter N 3b7bca28b3 Functional* code 2020-08-20 13:50:33 +08:00
silicons 11467e1cae Merge pull request #13212 from Putnam3145/reftrack 
Ports reftracking from TG.
 2020-08-19 22:03:16 -07:00
silicons 91484356c5 Merge pull request #13183 from SmArtKar/shuttle_hotfix 
Shuttle hotfix so now you can make huge shuttle things
 2020-08-19 21:03:58 -07:00
Putnam 81dc6c7ee5 Ports reftracking from TG. 2020-08-18 20:41:43 -07:00
Letter N 5dff3e9a04 deletes ping 2020-08-18 11:35:10 +08:00
Letter N 90cb13f6af Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT 2020-08-18 10:33:21 +08:00
SandPoot 66541bbe67 Adds tgstation's fix air for admins (#49) 2020-08-17 14:55:59 -03:00
Enric Gabriel cf2c21ea52 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-17 12:06:32 -03:00
Letter N 610e25beb7 oops updates asset cache 2020-08-17 20:51:05 +08:00
SmArtKar e087845745 reee 2020-08-17 13:32:18 +03:00
silicons f611945b34 Merge pull request #13180 from Detective-Google/glass-floors 
ports multiz glass floors (tgstation/tgstation#50831)
 2020-08-17 03:14:15 -07:00
Enric Gabriel 06496434a4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-16 23:30:53 -03:00
SmArtKar dd64dcc4ea Return of the King(and the limits) 2020-08-16 16:21:17 +03:00
SmArtKar 0a6eca818c Succesfull removal of shuttle limit 2020-08-16 15:59:31 +03:00
Detective Google 016fd2ac3c woo yeah yeah woo 2020-08-15 23:55:52 -05:00
SandPoot 518c70e6ed Some Cit reverts and skyrat features. (#46) 2020-08-15 13:29:50 -03:00
kiwedespars eb8574d6d6 heretics from tg (with changes) 2020-08-10 19:17:26 -07:00
Enric Gabriel bae8c236f6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-09 18:34:33 -03:00
lolman360 308d77da7c Merge branch 'master' into plumb 2020-08-09 22:48:18 +10:00
Letter N f1c4a7f6ac Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-09 14:54:16 +08:00