57 Commits
Author SHA1 Message Date
SandPoot c07e94be66 push 2024-08-24 21:28:55 -03:00
SandPoot 40f1d7401d procs 2023-11-29 22:40:13 -03:00
Hatterhat 8ca98934af lmao shit forgot to remove this too 2022-12-29 20:20:50 -06:00
Hatterhat 34eaf93a01 sorters! one-way setting! brazen code borrowing! 2022-12-29 20:18:34 -06:00
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00
Putnam3145 3627f5b0eb machienry 2021-06-21 20:08:36 -07:00
Putnam3145 630098c8aa that might be all 2021-06-21 20:03:27 -07: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
silicons 98d3ac80d9 :pika: 2020-07-20 11:25:17 -07:00
silicons 993b4ec222 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-16 19:39:46 -07:00
Letter N 2afab07b4a https://github.com/tgstation/tgstation/pull/52255 2020-07-16 20:05:37 +08:00
silicons 6ee63f66aa whew 2020-07-07 20:48:54 -07:00
kevinz000andGitHub a0ecf85e4b Update conveyor2.dm 2020-06-16 08:27:58 -07:00
Winter Flare 8e3f48a761 Reduces (or gives) weight classes to several items. 2020-04-19 17:13:19 -04:00
Ghommie 59b1a223a3 Ok, done. 2020-03-08 22:51:36 +01:00
Seris02 ab771d9505 I deleted an important thing 2020-01-20 15:48:55 +08:00
Seris02 afd848e45a weh 2020-01-20 10:29:09 +08:00
Ghommie 8566e2396d Brings in some mapping code updates. 2019-12-19 00:44:14 +01:00
kevinz000andGitHub ded283fa55 Update conveyor2.dm 2019-12-11 14:41:58 -07:00
kevinz000andGitHub 20defaba8e Update conveyor2.dm 2019-12-08 21:46:53 -07:00
Poojawa 284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
deathride58 b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
deathride58andGitHub e279392386 Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128
[MIRROR] Standardizes and cleans up some admin messages & logging
2018-06-09 05:53:25 +00:00
Jordan Brownandletterjay 5e15a988f6 Refactor machinery to default to being anchored 2018-06-01 11:28:19 -05:00
ShizCalevandletterjay 4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -05:00
Poojawa 5518efebea everything but mob stuff 2018-04-23 01:06:17 -05:00
LetterJayandGitHub 86ca6b424d Merge pull request #6366 from Citadel-Station-13/upstream-merge-37122
[MIRROR] Fixes interaction AI stuff
2018-04-14 07:44:50 -05:00
AnturKandCitadelStationBot 4e7d222224 Fixes conveyors. (#37152) 2018-04-13 04:30:32 -05:00
kevinz000andCitadelStationBot 9da197469b Fixes interaction AI stuff 2018-04-11 14:10:50 -05:00
Poojawaanddeathride58 5fa001c10f things with stuff (#6233)
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
2018-04-07 23:07:09 -04:00
deathride58 72ff7be9bd code folder. 221 files changed wew 2018-02-12 21:03:40 -05:00
CitadelStationBotandPoojawa 78ca971767 [MIRROR] Adds sprites for conveyor belt constructs (#5276)
* Adds sprites for conveyor belt constructs (#35252)

* lemme just convey this thought

* slight sprite update

* asdf

* Adds sprites for conveyor belt constructs
2018-02-04 23:12:47 -06:00
Jordan BrownandCitadelStationBot 0c9adb1ef6 Merge pull request #34641 from DaxDupont/belt-power
Fixes conveyor belt power usage.
2018-01-19 09:30:23 -06:00
Jordan BrownandCitadelStationBot 2498e1ddc0 Cleans up unused code 2017-11-20 10:14:32 -06:00
Jordan BrownandCitadelStationBot 178b41547d Little change. More the same 2017-11-06 08:46:39 -06:00
ShizCalevandCitadelStationBot f696ada7c8 Fixes conveyor belt layering (#31569) 2017-10-12 12:34:19 -05:00
Jordan BrownandCitadelStationBot 075cb673c0 Remove drop_item, drop_item_v, put_in_hands_or_del 2017-10-07 12:37:06 -05:00
LetterJayandkevinz000 188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
CitadelStationBot bd35823012 [ready]Makes bIcon better 2017-08-13 17:41:12 -05:00
CitadelStationBotandPoojawa 76f7fcef9a [MIRROR] Cleaned up paper varedits + tidied up paths (#2156)
* Cleaned up paper varedits + tidied up paths

* work smarter, not harder

* citadel snowflake

* Update uplink_item_cit.dm
2017-08-02 03:17:32 -05:00
CitadelStationBotandkevinz000 ff6bbbedf5 Changes some 1s and 0s to TRUE and FALSE (#1967) 2017-07-10 16:13:16 -07:00
CitadelStationBot d9e3699f88 Ports Goonchat 2017-06-08 16:27:56 -05:00
CitadelStationBot e382287f78 Fixes conveyor belts moving things with no gravity 2017-05-22 22:48:09 -05:00
LetterJayandGitHub b57a4aa6b4 Merge branch 'master' into upstream-merge-26386 2017-05-01 15:27:25 -05:00
LetterJay 085b421348 rej fixes 2017-04-28 09:03:56 -05:00
CitadelStationBot bcab389ca2 New() goes in the trash, we've gotta Initialize() 2017-04-26 17:15:48 -05:00
CitadelStationBot d931e5801c A bunch of Initialize()s now have return values 2017-04-25 03:51:57 -05:00
CitadelStationBot 1a93abc66e Conveyor movement refactor/fix 2017-04-21 17:28:09 -05:00