SandPoot
7523279254
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-02-07 22:07:59 -03:00
silicons and GitHub
af6e43c595
refactors clickcatchers/parallax/fullsceren ( #15460 )
...
* :)
* that
* move those there
* refactor that too
* wew
* stuff
* almost.
* sigh
* just need speed
* stuf
* pain
* hm
* tweaks
* that
* eh
* wack
* a
* done
* that's important
* wacky
* all that
* fixes
* typo
* that
* a
* funny
* that
* that
* woo
* help im losing my fucking mind
* okay
* fix
2022-02-07 15:17:24 -08:00
SandPoot
a0c181a721
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-02-04 15:13:32 -03:00
SandPoot
8acb800301
Upload files
2022-02-02 17:57:48 -03:00
SandPoot
34900425aa
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-11-17 13:48:32 -03:00
DeltaFire
6aa906395c
not a gaius reference
...
hhhh let me just replace all the ex_acts missing some args and adjust them
2021-11-14 21:34:59 +01:00
SandPoot
f1f6ac0109
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-31 22:14:23 -03:00
Letter N and GitHub
bcdf96f274
Revert "TGUI alerts, lists, inputs"
2021-10-28 12:17:29 +08:00
SandPoot
32a6e63698
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-27 23:11:54 -03:00
SandPoot
5aa12b4716
There's a bounty for this right? i spent nearly two full days at this
2021-10-05 18:10:32 -03:00
SandPoot
ab9b824ce9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-08-08 14:18:09 -03:00
Artur
82ccfc40dc
/obj/screen --> /atom/movable/screen
2021-07-29 13:57:19 +03:00
SandPoot
d863f9f437
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-06-27 15:54:58 -03:00
Putnam3145
dbdc3001ba
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
2021-06-16 23:33:14 -07:00
SandPoot
167ada9e17
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-06-13 23:17:50 -03:00
silicons and GitHub
431acd9d5c
Merge pull request #14820 from qweq12yt/more-cargo-stuff
...
[FIX] Some cargo related fixes
2021-06-13 15:15:20 -07:00
Putnam
833d34ba8e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
2021-06-11 16:28:12 -07:00
qweq12yt
584dce4a80
updating comments
2021-06-11 01:34:19 -03:00
SandPoot
91fd04c552
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-06-10 23:41:21 -03:00
qweq12yt
0ca61af62a
fixed combo lockers
2021-06-10 16:50:44 -03:00
keronshb
25fe97e8fe
Lets Disposal pipes work on the cargo shuttle again
...
Silly removal.
2021-05-29 13:21:23 -04:00
silicons
47489c21d6
Merge remote-tracking branch 'citadel/master' into auxtools-atmos
2021-04-27 00:59:45 -07:00
SandPoot and GitHub
ee72b01707
Smooth sailing ( #157 )
...
* upload files
* upload shuttle_upgrades.dm
* upload files
* upload shuttle_upgrades.dm
* upload files
2021-04-21 21:13:14 -03:00
SandPoot
bab386168e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-04-18 23:23:02 -03:00
qweq12yt
b97a38f125
todo comment
...
hopefully i will be able to do it in the future, or someone else will implement it
2021-03-31 00:55:14 -03:00
qweq12yt
04f90b749f
fixes material crates not shipping
2021-03-30 12:33:23 -03:00
SandPoot
afae5c3247
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-03-23 19:49:58 -03:00
LetterN
86b8bbf727
no more free shipping
2021-03-21 21:44:04 +08:00
Putnam
cc360288bd
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
2021-03-08 14:46:46 -08:00
SandPoot
20509121b8
Merge branch 'master' of https://github.com/Sandstorm-Station/Sandstorm-Station-13 ; branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-03-08 14:07:57 -03:00
Letter N
e84257e624
fix surgery cb, linter
2021-03-06 11:22:01 +08:00
Letter N
a43309a097
shuttle pog
2021-03-05 22:26:55 +08:00
SandPoot
af6a8bdd5c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-03-03 12:05:27 -03:00
Putnam
f07a9c13fb
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
2021-03-02 01:44:58 -08:00
Letter N
5c39381117
Merge remote-tracking branch 'origin/master' into rustsql
2021-02-23 11:36:05 +08:00
SandPoot
98e11d88a9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-02-21 23:29:09 -03:00
Letter N
7d39949a2f
Merge remote-tracking branch 'origin/master' into rustsql
2021-02-19 12:38:32 +08: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 2e29f30fdf724910cfab
2021-02-18 15:04:46 -03:00
SandPoot
cf2e70671a
upload files
2021-02-18 14:47:10 -03:00
Putnam
51100c9bf9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
2021-01-20 18:38:52 -08:00
SandPoot
8582f93800
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-01-20 19:14:59 -03:00
Letter N
125cd17cee
Merge remote-tracking branch 'origin/master' into rustsql
2021-01-20 15:40:41 +08:00
Letter N
021b28a2b7
cleanup
...
shitcode - b - gone
2021-01-20 11:08:21 +08:00
SandPoot
0d1a6c73fc
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-01-19 23:31:15 -03:00
Putnam
158dd11d8d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
2021-01-19 17:52:40 -08:00
Putnam
f05df1c7de
Huge optimizations+some fixes
2021-01-19 17:48:20 -08:00
silicons
ae290cf5f0
newlines
2021-01-13 16:56:36 -07:00
silicons
ddad368d6a
Merge remote-tracking branch 'citadel/master' into tgsync
2021-01-08 00:33:57 -08:00
SandPoot
168799038d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-01-04 02:05:26 -03:00
SandPoot