Commit Graph
396 Commits
Author SHA1 Message Date
Enric Gabriel c10471fac9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-30 01:42:29 -03: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
Enric Gabriel 06496434a4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-16 23:30:53 -03:00
silicons 8dedcbcf76 Merge branch '13113' 2020-08-16 18:53:35 -07:00
zeroisthebiggayandGitHub 5ad34ae298 Update spaceRuinBlacklist.txt
oops i forgot configgies
2020-08-15 17:06:02 -04:00
kiwedespars eb8574d6d6 heretics from tg (with changes) 2020-08-10 19:17:26 -07:00
Enric Gabriel bae8c236f6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-09 18:34:33 -03:00
Putnam 9bb3ba5c5a added ethereals 2020-08-08 00:08:43 -07:00
Enric Gabriel 372b486daf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-01 10:07:19 -03:00
Unknown 16722c47c3 CentCom Galactic Ban DB 2020-07-29 21:39:58 -05:00
Enric Gabriel 05593f84a0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-16 22:13:13 -03:00
Artur 5f9364c5f8 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-13 16:20:54 +03:00
Enric Gabriel beec77b17d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-11 20:04:30 -03:00
LinandGitHub 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 f757e54db9 muh immursion 2020-07-08 15:59:44 +08:00
Enric GabrielandGitHub 04445eaf3c [READY] New map (#13)
* some stuff for shuttle
* yay, an unoriginal map
looks like i'm the one responsible for it
* moves them to a path that game finds it
* requested changes
* some changes to fix shuttles
* more shuttle fixes
* almost done with it
* mapmerger
* making travis hate us less?
* permabrig shuttle
* more stuff
* thought it was abandoned
* renames it to the right name
* well, i guess we're testing
* almost finished with it, give me pizza
* who ya gonna call ?
the police, let me out of this basement
* forgot this one
* please, tell me that's how you connect them
* maybe the shuttle works now ?
* Revert "Merge branch 'new-map' of https://github.com/SandPoot/Sandstorm-Station-13 into new-map"
This reverts commit 1941a64e28, reversing
changes made to fda6afe660.
* Revert "maybe the shuttle works now ?"
This reverts commit fda6afe660.
* Revert "Revert "Merge branch 'new-map' of https://github.com/SandPoot/Sandstorm-Station-13 into new-map""
This reverts commit fbae802dd3.
* jeez, why did i make so many shuttles
i'm lazy
* google
how do i modify the changelog
* another one bites the dust
* is it finally done ?
* do we need viro ?
* IT ISN'T OVER!!
* this isn't the last one, apparently
Co-authored-by: crazyraio2 <44246096+crazyraio2@users.noreply.github.com> *actually mainly done by them*
2020-07-03 15:46:15 -03:00
Artur 765ffdb1a1 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-26 14:03:27 +03:00
siliconsandGitHub ea57a84eb8 Create policy.txt 2020-06-25 18:04:23 -07:00
siliconsandGitHub 6db9b8c5d7 Update config.txt 2020-06-25 17:59:47 -07:00
Enric Gabriel b41e4ad8ce Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-06-24 15:07:30 -03:00
Detective Google 28b0fb41e6 updates config on the repo to match changes (keeps everything blacklisted repo-side tho) 2020-06-22 20:39:14 -05:00
Artur c41d2e78be Conflicts!!! 2020-06-22 17:39:24 +03:00
Enric Gabriel 776b763e17 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-06-22 07:03:48 -03:00
Detective Google 4e26916502 Merge remote-tracking branch 'upstream/master' into bald-bald-bald-bald-bald-bald-bald 2020-06-20 14:00:14 -05:00
Detective Google 0e1db216c8 Ports the reworked snowcabin and beach away missions by Jerry Derpinson (the baldy) 2020-06-17 19:33:14 -05:00
Enric Gabriel cb261a1b74 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-06-17 20:23:21 -03:00
kevinz000andGitHub fbf09e84c4 Merge pull request #12531 from Detective-Google/o7-icebox
Takes icebox out back and old yellers it.
2020-06-16 23:36:41 -07:00
Artur ceba739231 Cooonflicts 2020-06-16 01:23:42 +03:00
Enric Gabriel 18faedfc1a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-06-15 17:36:27 -03:00
Detective Google 6b6c5c6ecd don't go gently into the night, sweet prince. 2020-06-13 22:25:18 -05:00
kevinz000andGitHub c2d0763aac Update defines.txt 2020-06-13 13:21:53 -07:00
kevinz000andGitHub b81b2bc044 Delete plushie_config.txt 2020-06-13 13:21:13 -07:00
Artur 48c1ae36d3 Guh 2020-06-11 18:51:01 +03:00
Enric Gabriel 7529b6c8c0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-06-10 12:45:44 -03:00
Timothy TeakettleandGitHub 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
Artur b6dc41b852 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-09 11:07:39 +03:00
Artur 33c5dfb28e TTV TGUI, VR sleeper work. 2020-06-08 12:28:16 +03:00
Enric Gabriel c5f4caffcc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-06-02 22:20:48 -03:00
GhomandGitHub 1c3bfa623f Merge pull request #12175 from Detective-Google/snaxi2
Adds a New map, Snow Taxi (A vgstation13 map port)
2020-06-02 23:48:50 +02:00
Enric Gabriel 6c2c5b8a3c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-05-26 21:46:40 -03:00
GhomandGitHub 85186a9714 Porting updates related to material datums. (#12317)
* Porting updates related to material datums.

* art_type

* oh oh
2020-05-25 14:21:00 -07:00
Detective Google d03d20d570 Merge remote-tracking branch 'upstream/master' into snaxi2 2020-05-22 13:52:56 -05:00
Enric GabrielandGitHub c6c341db2f Toggle disk msg (#12) 2020-05-20 04:10:01 -03:00
Enric Gabriel 04780698ce Merge branch 'master' of https://github.com/SandPoot/Sandstorm-Station-13 2020-05-15 20:05:47 -03:00
GhomandGitHub 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
Enric GabrielandGitHub ba6f71b117 this is all (#8) 2020-05-15 13:50:26 -03:00
Detective Google 6e5e1b249f Merge remote-tracking branch 'upstream/master' into snaxi2 2020-05-12 18:38:28 -05: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
Detective Google bfde367c4e Merge remote-tracking branch 'upstream/master' into snaxi2 2020-05-11 20:56:42 -05:00