cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-24 05:39:04 +01:00
Code Issues Packages Projects Releases Wiki Activity
38,600 Commits 8 Branches 0 Tags
machine-changes
Commit Graph
4105 Commits
Author SHA1 Message Date
Ghommie 686a76dd1d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-04 13:35:05 +01:00
Hatterhat 5142a0e4ae that should probably be there 2020-01-04 02:07:19 -06:00
Hatterhat 7c98656939 upstream merge 2020-01-04 01:48:50 -06:00
Hatterhat 186194418e tg 43454+43688 port, tweaks w/ trilby, db crate 2020-01-04 01:33:32 -06:00
Linzolle d0263fc669 don't act on non mobs 2020-01-03 18:21:08 -06:00
Ghommie f5b251db66 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-03 18:24:39 +01:00
kevinz000andGitHub d1d9b7a179 Merge pull request #10403 from r4d6/patch-1 
Add a way to make opaque plastic flaps
 2020-01-03 08:16:17 -08:00
kevinz000andGitHub 04649efc62 Update stack.dm 2020-01-03 02:46:57 -08:00
Seris02 519d379cdf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into atmosfirelock 2020-01-03 17:42:53 +08:00
BlackMajor a4d2ea0281 Small fix 2020-01-03 22:39:58 +13:00
r4d6andGitHub 7347cb0ba6 Merge branch 'master' into RCD-Updates 2020-01-03 03:09:11 -05:00
r4d6 5c94e02eac Add simple RCD Circuits 
Port : https://github.com/tgstation/tgstation/pull/45357
 2020-01-03 02:32:43 -05:00
r4d6 37d50e2aaf Add RCD effects 
Port : https://github.com/tgstation/tgstation/pull/47894 & https://github.com/tgstation/tgstation/pull/48362/files
 2020-01-03 02:13:20 -05:00
Putnam adf87c7595 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dojo-ghostrole 2020-01-02 22:52:24 -08:00
TrilbyspacecloneandGitHub 2931cb6757 Merge branch 'master' into glassware 2020-01-02 20:30:20 -05:00
LinandGitHub f7b91f9b65 Merge pull request #10238 from Ghommie/Ghommie-cit478 
Brings in some mapping code updates.
 2020-01-03 00:01:54 +00:00
LinandGitHub b1ccd512db Merge pull request #10215 from Ghommie/Ghommie-cit473 
Ports "Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls."
 2020-01-03 00:00:51 +00:00
kevinz000 a102bb18a0 Merge remote-tracking branch 'citadel/master' into god_wish_your_plushies_holy_shit 2020-01-02 09:39:48 -08:00
Ghommie 4d06d231f8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-02 17:49:01 +01:00
BlackMajor 08d042901c thank you github 2020-01-02 22:16:47 +13:00
BlackMajor aabb39a364 Revert "Merge branch 'master' into Yeehaw" 
This reverts commit 30e3edaac1, reversing
changes made to 62c8fce043.
 2020-01-02 22:06:31 +13:00
BlackMajor 30e3edaac1 Merge branch 'master' into Yeehaw 2020-01-02 22:03:58 +13:00
BlackMajor 3239acf74d Sync 2020-01-02 22:02:55 +13:00
r4d6andGitHub 6e5d04ff1f Adding a way to make opaque plastic flaps 2020-01-02 02:52:48 -05:00
kevinz000andGitHub e771ea9066 Merge pull request #10374 from Trilbyspaceclone/patch-260 
[s] Fixes Dragon's Tooth Sword 50% armor penetration by making it 35%
 2020-01-01 22:07:18 -08:00
nik707andGitHub be9912227f Merge pull request #10372 from Hatterhat/the-one-with-the-forcefields 
forcefield projectors on toolbelts, cool and good sprites for atmos holofan/forcefield proj
 2020-01-01 20:28:15 -06:00
chefferzandGitHub 6222b41204 Update forcefieldprojector.dm 2020-01-01 20:44:16 -05:00
kevinz000 094d225874 Merge remote-tracking branch 'citadel/master' into michael_labs 2019-12-31 19:54:01 -08:00
Hatterhat ef36b9df75 i love democracy 2019-12-31 21:44:03 -06:00
LinandGitHub b651bbcdb3 Merge branch 'master' into Ghommie-cit367 2019-12-31 22:37:59 +00:00
GhomandGitHub 0453363d4c Merge pull request #10345 from Trilbyspaceclone/patch-256 
Buffs bandoliers to hold more types of casings.
 2019-12-31 14:36:53 +01:00
GhomandGitHub 78e4c608ad Merge pull request #10319 from Seris02/coconutsyep 
porting azarak's coconuts from hyper station
 2019-12-31 13:16:07 +01:00
BlackMajor 8085022d97 Couple of changes. Starting on the point bank. 2019-12-31 23:28:30 +13:00
TrilbyspacecloneandGitHub c81d0e8b66 Update energy.dm 2019-12-31 05:25:12 -05:00
Seris02 54f859fe06 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2019-12-31 17:52:49 +08:00
Hatterhat 5a497b02ac hey i'm WALKIN here 2019-12-31 01:56:01 -06:00
kevinz000andGitHub 79c609aa40 Update telescopic_iv.dm 2019-12-30 17:55:59 -08:00
nik707andGitHub 5c13fa64e3 Merge pull request #10338 from Seris02/marshmallow 
marshmallow
 2019-12-30 18:31:06 -06:00
Putnam 71fcd23f1f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dojo-ghostrole 2019-12-30 13:31:15 -08:00
Ghommie 80e716eeaf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447 2019-12-30 18:14:47 +01:00
Seris02andGitHub f0ba93052d yee2. 2019-12-30 23:53:10 +08:00
Seris02 714f76c8aa more changes 2019-12-30 18:48:29 +08:00
Putnam 90ebbdfdb9 elements are so good. they're so good 2019-12-30 00:53:03 -08:00
kevinz000 24e3b88a34 Merge remote-tracking branch 'citadel/master' into michael_labs 2019-12-30 00:32:25 -08:00
Seris02 40730b48d5 few fixes 2019-12-30 11:49:16 +08:00
Seris02 f663c4db96 tiny fixes 2019-12-30 11:24:12 +08:00
TrilbyspacecloneandGitHub 4a5715e5ac Update belt.dm 2019-12-29 19:13:32 -05:00
Ghommie edd05cebea Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367 2019-12-30 00:28:36 +01:00
Seris02 b96bcf6eec tiny fix 2019-12-29 23:47:30 +08:00
Seris02 a39c0249c4 marshmallow 2019-12-29 21:55:25 +08:00