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-10 18:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,291 Commits 55 Branches 0 Tags
54641ce2015f632b07e09f065abc119f677b7fed
Commit Graph

402 Commits

Author SHA1 Message Date
silicons
31791df2bd fixes 2020-09-21 20:38:43 -07:00
silicons
2c4dc4d1a9 ok 2020-09-21 19:08:21 -07:00
silicons
ddc7f10de7 fixes 2020-09-21 18:35:42 -07:00
silicons
7249fe058f config based 2020-09-21 17:36:30 -07:00
silicons
9fef16964c Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-09-21 03:13:51 -07:00
silicons
c5403b5ef4 fixes 2020-09-20 02:49:42 -07:00
timothyteakettle
c3bea5f77b wounds 2020-09-15 23:50:26 +01:00
timothyteakettle
7be15afb32 config 2020-09-15 23:20:11 +01:00
Artur
c79e9fbc0b https://github.com/tgstation/tgstation/pull/53263 2020-09-02 18:48:09 +03:00
Letter N
fe17bee28e reverts thing kev said about 2020-08-29 14:36:41 +08:00
Letter N
afe32406c0 Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT 2020-08-22 13:40:36 +08:00
Letter N
2dd3d71b19 config&copypaste chang. 2020-08-20 16:36:24 +08:00
Letter N
3b7bca28b3 Functional* code 2020-08-20 13:50:33 +08:00
silicons
91484356c5 Merge pull request #13183 from SmArtKar/shuttle_hotfix 
Shuttle hotfix so now you can make huge shuttle things
 2020-08-19 21:03:58 -07:00
Letter N
90cb13f6af Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT 2020-08-18 10:33:21 +08:00
Letter N
610e25beb7 oops updates asset cache 2020-08-17 20:51:05 +08:00
SmArtKar
e087845745 reee 2020-08-17 13:32:18 +03:00
SmArtKar
dd64dcc4ea Return of the King(and the limits) 2020-08-16 16:21:17 +03:00
SmArtKar
0a6eca818c Succesfull removal of shuttle limit 2020-08-16 15:59:31 +03:00
kiwedespars
eb8574d6d6 heretics from tg (with changes) 2020-08-10 19:17:26 -07:00
Unknown
16722c47c3 CentCom Galactic Ban DB 2020-07-29 21:39:58 -05:00
silicons
e03948dcba Merge pull request #12229 from Arturlang/TGUI-3.0 
[READY]TGUI 3.0
 2020-07-16 17:28:42 -07:00
Letter N
2afab07b4a https://github.com/tgstation/tgstation/pull/52255 2020-07-16 20:05:37 +08:00
Artur
5f9364c5f8 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-13 16:20:54 +03:00
Lin
955d9fa0cc Merge pull request #12624 from Citadel-Station-13/policy 
policy configuration & support hooks for clone memory disorder
 2020-07-11 16:40:38 -05:00
Letter N
05684e7196 no config filter thing yet, but the code for it is "ready" 2020-07-08 16:36:58 +08:00
Letter N
f757e54db9 muh immursion 2020-07-08 15:59:44 +08:00
Artur
280d3de6c3 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-07 18:37:45 +03:00
Ghom
871993ce14 Merge pull request #12593 from silicons/autobunker 
adds verb to auto bunker override on linked servers
 2020-07-04 18:36:59 +02:00
silicons
e2975a44a1 Merge branch 'master' into policy 2020-07-02 01:23:19 -07:00
Artur
20245f7319 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-30 02:30:29 +03:00
Putnam3145
ee2fedd4af Merge pull request #12390 from Ghommie/Ghommie-cit800 
Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event.
 2020-06-29 12:44:33 -07:00
silicons
c88b7721ad Update policy.dm 2020-06-29 05:03:45 -07:00
silicons
836391075f Update config_entry.dm 2020-06-29 05:03:13 -07:00
silicons
2a0b3ce036 typo 2020-06-26 23:48:56 -07:00
silicons
0df5aa083b policies and code hooks 2020-06-26 23:41:44 -07:00
silicons
9c70fa2136 Update configuration.dm 2020-06-24 20:40:57 -07:00
silicons
b367f76c62 autobunker 2020-06-24 07:49:45 -07:00
Ghommie
ae053a9a08 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit800 2020-06-23 03:12:49 +02:00
Artur
c41d2e78be Conflicts!!! 2020-06-22 17:39:24 +03:00
SmArtKar
46c3e9e54d Shuttles 2020-06-16 18:16:14 +03:00
Artur
ceba739231 Cooonflicts 2020-06-16 01:23:42 +03:00
Timothy Teakettle
14c9ab2ff1 ports tgs regal rats (#12479) 
* port regal rats

* fix missing line

* royal rat goes after humans too

* okay dont let them attack people

* let them attack people but at less damage

* remove header
 2020-06-09 03:28:00 -07:00
Ghommie
e51ac4e745 Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event. 2020-05-29 17:58:35 +02:00
Artur
9d04b0835b Conflicts galore 2020-05-21 21:08:12 +03:00
Ghom
20ac2f26f4 Demodularizing the gear loadout code a little. (#12261) 2020-05-18 04:45:50 -07:00
Ghom
7c7147cb3e Field of Vision component. (#12075) 
* Hopeless WIP for vision cones.

* Core component and hooks done

* Removing clutter.

* linter bashing me for using statements as args.

* Ok.

* continue

* bring back the macro

* Configs and openspace filter.

* Chat plane, reset perspective signal, mechs/vehicles cases, machineries.

* view, viewers and spoopy ghosts.

* Renamed component, admin fun button and snowflakes robots.

* Whoopsie.

* Yikes

* test merge tweak.

* radial yaketi sax.

* Fixed tgui UIs, some messages not displayed to the target.

* Documentation and a little bugfix.

* Pulling QoL, seventh plane made in this PR.

* Fix.

* Tweaks and improvements.

* Update randomverbs.dm
 2020-05-15 15:25:04 -07:00
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