cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-23 13:18:59 +01:00
Code Issues Packages Projects Releases Wiki Activity
38,600 Commits 8 Branches 0 Tags
machine-changes
Commit Graph
216 Commits
Author SHA1 Message Date
Enric Gabriel 30e7b6c815 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-06 14:38:37 -03:00
dapnee cb17ea4874 More Active Turf Fixes 
None of these nerds make their map names logically and it's hard to find which is which wihout going through a hundred of them.
 2020-08-04 12:16:29 -06:00
Enric Gabriel 372b486daf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-01 10:07:19 -03:00
dapnee dcf3155b7f Map Edits Three: The Mappening 
Fixes active turfs in wizard ruin that spawns in lavaland and ones on the space hermit asteroid. Fixes delta missing APC's for botany, the pool, and the little lounge area before toxin's testing site. And a light to the server room so it's not pitch black in there.
 2020-07-30 16:29:04 -06:00
Enric Gabriel 48f8a998d5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-27 10:33:25 -03:00
dapnee 8fbdc6257c Update listeningstation.dmm 
it's a fan
 2020-07-26 18:26:52 -06:00
Enric Gabriel f0904c6b10 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-21 01:19:25 -03:00
siliconsandGitHub 267186a5d3 Merge pull request #12646 from Chiirno/emi 
[READY] Alt-click cigarette pack functionality added to pill bottles.
 2020-07-20 16:15:38 -07:00
Enric Gabriel 05593f84a0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-16 22:13:13 -03:00
Artur 9de8483bcf Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-09 22:14:20 +03:00
Enric Gabriel 3cba98b3ff Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-08 21:31:37 -03:00
Ghommie 562b57095d mowing down the experimental cloner copypasta. 2020-07-05 03:04:53 +02:00
Cirno 020da9fa07 i hope this works 2020-07-04 15:47:38 -03:00
Enric Gabriel 7b991331eb removes something that breaks travis 2020-07-04 13:11:07 -03:00
Artur 6ee1eba56c Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-02 23:23:47 +03:00
Enric Gabriel 67777c41e8 fixes stuff with old path? 2020-07-02 00:39:56 -03:00
Enric Gabriel f5bd261e38 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-06-30 22:01:51 -03:00
crazyraio2 c25d0b3e84 Gotta fix some stuff eh ? 2020-06-26 19:13:55 -03:00
crazyraio2 99796a4e81 Better Charlie Station 2020-06-23 13:09:14 -03: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 aff4e5f93f Linter fixes 2020-06-22 17:58:52 +03: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
Ghommie 1bca74465f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-05-30 03:29:02 +02:00
EmeraldSundiskandGitHub da772b9cb7 Adds the "Space Diner" space ruin. (#12337) 
* Create spacediner.dmm

* Update spacediner.dmm

* Update spacediner.dmm

* Conversion.

* Adds the beacon and APC.
 2020-05-24 13:11:49 -07:00
Ghommie 30ab79e09e Porting the twohanded component. 2020-05-17 18:16:53 +02:00
Ghommie e0a51903a1 Not yet implemented design security level requirements. 2020-04-24 00:51:04 +02:00
Artur 2134515d5c Merge remote-tracking branch 'upstream/master' into tackling_and_lunge 2020-04-15 12:19:37 +03:00
Linzolle 39e6541ccd remove bad words 2020-04-14 17:54:07 -05:00
Ghommie ab3ed7f9c2 Space Hermit Ruin fixes. 2020-04-11 23:27:19 +02:00
Artur fe755a1424 Tackling Working so far, working on the lunge now 2020-04-09 21:42:00 +03:00
kevinz000GitHubGhom
 		8b2132317b Ports a rewritten version of BAYSTRUMENTS (#11680) 
* bay instruments

* k

* AAA

* remove that

* changes

* Update _instrument_key.dm

* safety nets

* @ghommie fixed

* volume

* Update item.dm

* Update item.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-04-07 15:21:50 +02:00
Ghommie 86898cc451 Force pushed updates 2020-03-22 01:43:19 +01:00
HatterhatGitHubHatterhat
 		ab7fc2dc72 me and the boys stealing prs (#11517) 
Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
 2020-03-19 13:38:31 +01:00
BlackMajor ca6341aac4 Merge branch 'master' into SpaceRuins 2020-02-24 19:47:52 +13:00
BlackMajor 984b57560b Fixes cults being able to summon at ruins. As well as stops the ash storm sound. 2020-02-21 01:39:16 +13:00
BlackMajor aff71e7f14 Initial Commit. Adds space ruins to station z. 2020-02-17 23:44:06 +13:00
Ghommie 55fa48737e Forgot about not versioned files. 2020-02-02 01:28:16 +01:00
Ghommie 7837688426 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2019-12-28 23:41:10 +01:00
Ghommie e0caf6007b Fixes space hermit asteroid rocks unintendedly spawning airless asteroid turf when mined, save for the perimeter... 2019-12-07 04:02:33 +01:00
Ghommie 9f00423bbd Fixing the deep space gorilla. 2019-10-29 21:51:00 +01:00
kevinz000andGitHub 9096f03ad3 Merge pull request #8654 from Ghommie/Ghommie-cit54 
ports in the Hilbert's Hotel.
 2019-10-24 19:07:33 -07:00
kevinz000andGitHub 969bc83179 Merge pull request #9586 from BlackMajor/Yeehaw 
Adds posibrains to the spawners menu for ghosts.
 2019-10-24 18:45:57 -07:00
BlackMajor 8b61fe3d72 posibrains on spawn list 2019-10-23 22:46:10 +13:00
Ghommie f843a53fe9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 2019-08-24 12:52:16 +02:00
Poojawa 96834bc517 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-20 03:36:17 -05:00
BlackMajorandGitHub 1d22b77293 Merge pull request #8636 from Trilbyspaceclone/lighten_up 
Fixes missing air in Gas the Lizards in the freezer/surgery
 2019-08-19 20:02:26 +12:00
Poojawa 283b5d050e Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-08 16:51:53 -05:00
Ghommie 23e3263fcb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 2019-08-08 04:46:54 +02:00
kevinz000andGitHub aea2f6f523 Merge pull request #8900 from Seris02/spaceruinsyee 
Abductor Replication Lab space ruin - take 2
 2019-08-05 00:55:40 -07:00
Poojawa 3499d73f6b Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods 2019-07-31 19:24:39 -05:00