shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46,900 Commits 5 Branches 0 Tags
fca2f71b7bcaf57e8e344e4c5f85e4d78fbda5bc
Commit Graph

90 Commits

Author SHA1 Message Date
SandPoot
695835fcd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 00:03:13 -03:00
SandPoot
586a035132 Update files 2022-04-06 18:41:31 -03:00
SandPoot
189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
SandPoot
a8f454bd72 Upload files 2022-03-16 14:00:31 -03:00
silicons
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
DeltaFire
6224da71a3 contents_explosion 
at least this one had less overrides.
 2021-11-14 21:41:42 +01: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
Artur
82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
Artur
3100f98b90 https://github.com/tgstation/tgstation/pull/57915 2021-07-28 02:13:57 +03:00
raspy-on-osu
622a3df378 Merge branch 'master' of https://github.com/raspy-on-osu/Citadel-Station-13 into ventcrawl-refactor 2021-01-24 19:21:24 -05:00
silicons
bffc43e95e fixes 2021-01-08 18:59:26 -08:00
silicons
bd3761d39e proper smooth movement 2021-01-08 10:51:48 -08:00
raspy-on-osu
0e652cb64c init 2020-12-26 06:02:09 -05:00
Letter N
a808f805d4 ASYNC EVERYTHING! 2020-12-21 16:24:51 +08:00
silicons
5b03f5b0ec more 2020-11-12 23:36:18 -07:00
silicons
95ebeac5b6 fix 2020-09-15 17:27:11 -07:00
Letter N
454baea55f Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-04 09:31:34 +08:00
silicons
06f5ce6401 buffs shoving (#12925) 
* ^w^

* ok

* ok
 2020-08-02 18:30:09 +02:00
Letter N
10fefca674 another batch. MAJOR: chem_master, pandemic 2020-07-30 14:06:20 +08:00
Artur
5f9364c5f8 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-13 16:20:54 +03:00
Putnam
a625d6562b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-07-08 22:02:03 -07:00
Artur
9d04b0835b Conflicts galore 2020-05-21 21:08:12 +03:00
Ghom
335f5a37b9 Plane adjustments on several low layer objects. (#12286) 2020-05-17 17:02:57 -07:00
Putnam
e8d7da56f4 Ported C++mos from yogs (help me) 2020-05-11 15:44:26 -07:00
Artur
80b47ec1c0 Ports https://github.com/tgstation/tgstation/pull/50497 2020-04-23 09:55:28 +03:00
Ghommie
59b1a223a3 Ok, done. 2020-03-08 22:51:36 +01:00
kevinz000
93d995eb18 k 2020-03-06 10:13:11 -07:00
kevinz000
0e4692c63d Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-18 18:16:34 -07:00
Ghom
fdbef6a93c Update bin.dm 2020-02-13 13:10:36 +01:00
kevinz000
6a8a606f97 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-04 16:01:25 -07:00
Artur
fe92573fc3 Forgot this 2020-02-02 13:44:44 +01:00
Artur
db36a90e35 Fixes. 2020-01-30 19:23:38 +01:00
Artur
f5ad854c2c Conflict fix 2020-01-20 13:50:52 +02:00
kevinz000
f85527ab4b Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-19 16:18:12 -07:00
Artur
d04c09aba0 Compiles, just need to fix goonchat 2020-01-15 09:44:03 +02:00
Artur
8b8a112d2c Ohkay 2020-01-15 09:41:33 +02:00
kevinz000
7378d91684 ([\W\.])Knockdown\( 2020-01-06 03:39:20 -08:00
Ghommie
d88f50ac15 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-12-23 05:02:31 +01:00
Ghom
a7cda1aea0 Merge pull request #10059 from lolman360/HeadCorgi 
you can pick up corgis now
 2019-12-21 11:05:36 +01:00
Ghommie
542c9007ee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-12-06 20:09:35 +01:00
Ghommie
9ca7bb759c Ports "Slightly improves visible and audible messages." 2019-12-06 02:02:12 +01:00
lolman360
dc1c17226d Merge branch 'master' into HeadCorgi 2019-11-28 08:45:19 +11:00
BlackMajor
c81d1fe7a3 Merge pull request #9867 from Ghommie/Ghommie-cit375 
Ports "examine-code refactor"
 2019-11-25 11:31:03 +13:00
lolman360
216790d442 Merge branch 'master' into HeadCorgi 2019-11-22 21:54:05 +11:00
Ghommie
dd101ef221 Part 2 2019-11-19 18:00:56 +01:00
lolman360
4d71f95b16 Merge branch 'master' into HeadCorgi 2019-11-17 12:24:04 +11:00
lolman360
aed866339f pickup pickup pickup pickup 100% pickup 2019-11-17 12:00:17 +11:00
GrayRachnid
3edaf75722 Ports the Saboteur borg for nukeops and ports new cyborg tool icons and cyborg taser/laser icons. 2019-11-15 16:58:45 -05:00
Ghommie
6484eea339 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-11-15 00:36:50 +01:00
kevinz000
6909857e04 Merge pull request #9632 from Ghommie/Ghommie-cit281 
Porting multi-z support updates.
 2019-11-14 15:58:53 -07:00