cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 18:33:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,867 Commits 55 Branches 0 Tags
dabdf16eacab8cdea3bf8a875d14627a6fd931c2
Commit Graph

161 Commits

Author SHA1 Message Date
Artur
dabdf16eac Coonflict fiiixeeess 2020-05-13 12:56:17 +03:00
Artur
5b7d9a9008 Merge conflict fix 2020-05-13 12:37:18 +03:00
Ghommie
7fb96ab0cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-05-12 20:06:59 +02:00
Ghommie
643ef48f0e Macros, generic skill implementations. 2020-05-05 04:42:34 +02:00
Artur
f97f264fb7 Fixing more stuff 
Mint machine compile fixes and the syndicate contractor program.
 2020-04-23 20:09:42 +03:00
Artur
120615d472 Ports https://github.com/tgstation/tgstation/pull/44525, and 
And fixes to make stuff work
 2020-04-23 17:36:13 +03:00
Artur
a8aa2e2014 Updates modular computers, begins work on shuttle stuff. 2020-04-23 15:06:35 +03:00
Artur
80b47ec1c0 Ports https://github.com/tgstation/tgstation/pull/50497 2020-04-23 09:55:28 +03:00
Ghommie
4c6f1b622b Porting Goofconomy & co. 2020-04-17 07:48:11 +02:00
spookydonut
230e5fca20 fix everything 2020-04-11 15:32:09 +08:00
Ghommie
1d51ac5ff2 Fixing some bug reports. 2020-03-14 02:34:25 +01:00
Ghom
d5a6c25128 Update tablet.dm 2020-03-11 13:19:57 +01:00
kevinz000
e210f7d535 Merge pull request #11391 from Ghommie/Ghommie-cit612 
Porting "Further update_icon splitup"
 2020-03-10 05:58:17 -07:00
Ghommie
59b1a223a3 Ok, done. 2020-03-08 22:51:36 +01:00
Kraseo
dff0e03f11 fixes null runtime and baton inhands 2020-03-08 00:27:16 +01:00
Kraseo
ad20fb1a0e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties 2020-03-06 11:58:11 +01:00
Kraseo
edfe50579e ACTUALLY fixes null runtimes + double contracts 2020-03-04 13:17:24 +01:00
kappa-sama
ec3e2ddb24 no more laptop slowdown 2020-03-01 21:17:48 -05:00
Kraseo
648f7793d3 proving to the world i'm retarded one commit line at a time 2020-03-01 23:56:34 +01:00
Kraseo
e3c77f2f5a part 4: the one where i slowly go insane 2020-03-01 22:05:35 +01:00
Kraseo
d93ade7e03 part 2: bloody tendency 2020-03-01 17:37:18 +01:00
Kraseo
38f7821dd6 part 1: battle stream 2020-03-01 16:56:13 +01:00
Ghommie
8fbfd07692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-22 00:55:32 +01:00
Seris02
26e16d7c89 yeet 2020-02-06 07:49:19 +08:00
Seris02
6cc6aa12be yeehaw it's done 2020-02-05 16:54:57 +08:00
Ghommie
a726f09201 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-04 03:54:52 +01:00
kevinz000
2393dc26eb Merge pull request #10779 from Ghommie/Ghommie-cit538 
added a second macro argument to STATION_TIME and STATION_TIME_TIMESTAMP.
 2020-02-02 16:31:59 -07:00
Ghommie
95db5084ab Screw commit history. 2020-02-02 01:26:04 +01:00
Arturlang
83ce84cdc4 Merge branch 'master' into TGUIs_Nexties 2020-01-30 20:46:20 +02:00
Ghommie
0dba1b5102 added a second macro argument to STATION_TIME and STATION_TIME_TIMESTAMP. 2020-01-30 02:17:02 +01:00
Seris02
e45cc4933c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup 2020-01-27 08:33:38 +08:00
kevinz000
a5404f6063 Merge pull request #10687 from Ghommie/Ghommie-cit523 
A few more, ported, runtime fixes.
 2020-01-25 05:54:03 -07:00
Artur
e360ac1d36 Conflict fix 2020-01-24 23:06:32 +01:00
Ghommie
721fd108f9 A few more, ported, runtime fixes. 2020-01-24 03:02:07 +01:00
Artur
255f2ce449 Testmerge Conflict fix? 2020-01-22 20:17:42 +01:00
Arturlang
0a545da35d Webedit galore 2020-01-22 18:12:26 +01:00
Arturlang
e025c8a743 Oh right its a typo 2020-01-22 18:11:37 +01:00
Seris02
74be93a8cc hasSiliconAccessInArea vars change 2020-01-21 11:44:49 +08:00
Artur
f5ad854c2c Conflict fix 2020-01-20 13:50:52 +02:00
Seris02
fdf3871cb7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup 2020-01-18 18:30:51 +08:00
Seris02
04b34ec8ed hijack implant 2020-01-18 18:04:31 +08:00
Artur
8b8a112d2c Ohkay 2020-01-15 09:41:33 +02:00
Ghommie
02fbbd4f95 Ouch. 2020-01-12 16:54:08 +01:00
Putnam3145
0adcb900c1 Merge pull request #10155 from Seris02/windowfix 
adds some distance checks to some things
 2019-12-17 11:34:13 -08:00
Seris02
7b75612ad1 woops 2019-12-12 19:21:23 +08:00
Seris02
f565c1cd3c adds some distance checks 2019-12-12 18:48:25 +08:00
Ghommie
3b8aebbbc2 refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open. 2019-11-29 00:40:16 +01:00
Ghommie
dd101ef221 Part 2 2019-11-19 18:00:56 +01:00
Ghommie
c20bc123ab Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit336 2019-11-15 01:10:39 +01:00
kevinz000
178aedc5cc Merge pull request #9754 from Ghommie/Ghommie-cit330 
porting "global to static"
 2019-11-14 16:38:27 -07:00