cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-21 20:28:14 +01:00
Code Issues Packages Projects Releases Wiki Activity
50,585 Commits 8 Branches 0 Tags
master
Commit Graph
61 Commits
Author SHA1 Message Date
SandPoot 46384d2a67 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-01-07 03:36:25 -03:00
SandPoot 76e7ffc80d push 2024-01-06 17:36:02 -03:00
SandPoot 65ed5c79f4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-12-30 02:07:21 -03:00
SandPoot 7533d51ae4 is_cyborg 2023-12-13 13:07:10 -03:00
SandPoot 6108e1d522 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-07 19:46:26 -03:00
Linzolle cd1389ae0f fix catwalks 2022-08-02 22:59:59 -07:00
SandPoot ada0ea7f32 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-09 02:40:23 -03:00
SandPoot 189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
SandPoot e738c3cf21 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-08-27 12:40:48 -03:00
keronshb e7b6c9ab5e Catwalk Flooring 2021-08-22 22:41:48 -04:00
SandPoot 98e11d88a9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-02-21 23:29:09 -03:00
SandPoot 123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing" 
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
 2021-02-18 15:04:46 -03:00
SandPoot cf2e70671a upload files 2021-02-18 14:47:10 -03:00
SandPootandGitHub 14bfe8a564 Tile reskinning (#98) 
* part 1

* part 2

* part 3

* kinda part 4?

just takes this out because there's a proc that will add text to the examine.
 2020-10-27 17:07:39 -03:00
Detective-GoogleandGitHub 260ed6eff6 fixes arcade carpet 2020-10-05 21:27:42 -05:00
Detective Google 98703e6ad6 Merge remote-tracking branch 'upstream/master' into arcade-carpets 2020-10-01 13:41:10 -05:00
Detective Google 643421bc23 adds arcade carpets 
yay
 2020-09-28 14:43:03 -05:00
ItzGabby b97b595f6f Three new wooden floor types 2020-09-26 18:29:46 -04:00
silicons 815ddd1866 oh boy 2020-08-05 21:34:26 -07:00
Ghommie c5cbfa64e5 Porting further material datum features and improvements. 2020-06-24 20:45:17 +02:00
Ghommie 495ccc99c5 Porting some cargo/vending updates. 2020-06-08 06:12:51 +02:00
Ghommie b383066e57 Replacing the MATERIAL_NO_EFFECTS flag with MATERIAL_EFFECTS. 2020-05-02 00:00:49 +02:00
KathrinBailey adeb61180c big floof 2020-04-06 01:09:25 +01:00
Ghommie 95db5084ab Screw commit history. 2020-02-02 01:26:04 +01:00
TrilbySpaceClone 67d3d19cb9 correctiosn 
and movement
 2019-12-07 13:43:34 -05:00
Useroth 2e84c30e59 Tiny touch-ups 2019-12-05 16:29:50 +01:00
Useroth 950b884da5 Adds colored fairygrass. 2019-12-05 01:47:42 +01:00
Useroth 2ced7db508 Ported a bunch of tg hydroponic stuff. 2019-11-21 10:53:57 +01:00
Poojawa 6d9aa8de70 More carpet options and ways to get them 2019-10-03 22:54:10 -05:00
Redtail 629189fdc1 Added Another new carpet, and two tables, and a new cargo crate. 
Added:  monochrome.  Two new table sprites for the other new carpet.  New cargo supply crate for the two new carpets.  Changed:   the name of the new carpet to "blackred" so it would avoid confusion with the original carpet.
 2018-12-07 22:48:46 -06:00
Redtail e339bcd2ca Added a new carpet 
Worked on adding a new carpet.  It isn't -finished- yet and Trilby is going to help look over what I've done so I can make this work.
 2018-12-01 20:21:18 -06:00
Poojawa 8b9ef1e400 Game folder 2018-09-11 04:06:45 -05:00
deathride58 91805b8789 and that just leaves the modules folder 2018-07-02 00:28:51 -04:00
Jordan BrownandCitadelStationBot f9353da855 Quote the armor lists 2018-02-16 00:26:26 -06:00
deathride58 72ff7be9bd code folder. 221 files changed wew 2018-02-12 21:03:40 -05:00
CitadelStationBotandkevinz000 cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014) 
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
 2017-12-11 16:36:38 -08:00
swindlyandCitadelStationBot 3fa561c3b1 fixes spelling and stuff (#32531) 2017-11-09 11:04:50 -06:00
LetterJayandkevinz000 188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
kevinz000andGitHub 35b7b93b24 ok this is going to be a pain in the ass ain't it (#2458) 
lets hope nothing blows up this time (Flags PR but it works!)
 2017-08-22 05:01:38 -07:00
kevinz000andGitHub 6a309b5996 Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" (#2457) 
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
 2017-08-22 04:04:21 -07:00
CitadelStationBot 87b3df3069 Replace all secondary flags with bitflags stored in the flags_2 var 2017-08-17 09:19:14 -05:00
CitadelStationBot 1b2efdcc1d More Initialize() garbage 2017-08-06 18:02:51 -05:00
CitadelStationBot a72962c300 Made some object lists less terrible to read 2017-07-18 09:44:43 -05:00
PoojawaandGitHub b1b4826c0c July 5th TG sync (#1883) 
July 5th TG sync
 2017-07-05 22:14:19 -05:00
LetterJay 190b47983c cleanup 2017-06-08 03:39:13 -05:00
LetterJay 9b840ae323 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27891 2017-06-08 03:36:39 -05:00
LetterJayandGitHub 923c5b9035 Merge pull request #1308 from Citadel-Station-13/upstream-merge-27881 
[MIRROR] Luxury Bluespace Shelter Capsules, Take 2.
 2017-06-08 03:35:23 -05:00
LetterJay 3563459d15 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27891 2017-06-08 03:33:56 -05:00
CitadelStationBotandkevinz000 b5d2cf3c99 [READY] Stacks will change item_states and w_class based on how full they are. (#1370) 2017-06-04 09:08:33 -07:00