Commit Graph

377 Commits

Author SHA1 Message Date
silicons 8dedcbcf76 Merge branch '13113' 2020-08-16 18:53:35 -07:00
zeroisthebiggay 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
Putnam 9bb3ba5c5a added ethereals 2020-08-08 00:08:43 -07:00
Unknown 16722c47c3 CentCom Galactic Ban DB 2020-07-29 21:39:58 -05: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 f757e54db9 muh immursion 2020-07-08 15:59:44 +08:00
Artur 765ffdb1a1 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-26 14:03:27 +03:00
silicons ea57a84eb8 Create policy.txt 2020-06-25 18:04:23 -07:00
silicons 6db9b8c5d7 Update config.txt 2020-06-25 17:59:47 -07: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
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
kevinz000 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
Detective Google 6b6c5c6ecd don't go gently into the night, sweet prince. 2020-06-13 22:25:18 -05:00
kevinz000 c2d0763aac Update defines.txt 2020-06-13 13:21:53 -07:00
kevinz000 b81b2bc044 Delete plushie_config.txt 2020-06-13 13:21:13 -07:00
Artur 48c1ae36d3 Guh 2020-06-11 18:51:01 +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
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
Ghom 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
Ghom 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
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
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
Putnam3145 e1d113b970 Config for antag forcing (#12171) 2020-05-10 21:35:20 +02:00
Detective Google 9f25759aa8 Citsnow -> final name (Snaxi) , fixes arrivals 2020-05-09 00:53:04 -05:00
Detective-Google bd37d45334 Ports TG Icemoon framework and map (#49680) (#12002)
* ports all the tg junk for icemoon, not yet changed to make it all compile

* fixes

* fixes

* fixes

* fixes

* fixes

* new stuff

* whew

* fixes

* it compiles, now to fix the maps

* fixes the maps

* fixes solars + removes the space tiles in the toxins burn chamber

* nukes the SpawnTerrain proc used for tg geysers

* linter fix

* fix

* fixes the non matching turf atmos (hopefully)

* more mapping fixes

* dmm2tgm

* unfucks changeturf for the more_caves

* fixes the volanic subtypes of the other thing

* fixes the stupid fucking tile placing list

* some map fixes, fixes the station_ruin loader shitting out errors this commit took 2 hours of my fucking life

* fixes a bunch of mismatch atmos in ruins

* fixes wendigo cave having no air

* backwards couch backwards couch

* fixes the SM up

* wendigos can't runtime when butchering if you can't butcher them 😎

* makes the wendigo fight have the same atmos as the surrounding icemoon

* Tweaks atmos mixture from o2=22;n2=82;TEMP=180 to o2=18;n2=63;TEMP=180, making lavaland weapons actually work

* makes the wendigo screech shake not completely aids

* fixes snowlegion portals dropping proper legions instead of skeles

* brings the engioutpost ruin over as well

* whoopps

* empty commit to reroll bots

* Fixes pirates, ops, the mining base, and gives pirates and ops drills

* fixes lone ops and ninjas

* fixes the snowed plating getting fucked when tiles are placed on it

* removes some OP junk from the wabbajack pool (aka removes non-antag headslugs again)

* more bug fixes

* empty commit to reroll bots

* hopefully finally kills the active turfs on the library ruin

Co-authored-by: kevinz000 <2003111+kevinz000@users.noreply.github.com>
2020-05-07 14:46:16 +02:00
Detective Google 071735c5fd these weren't checked, QUIRKY 2020-05-03 20:04:40 -05:00
Ghommie a194d7dafe merge conflict and job/dept discounts support. 2020-05-03 02:11:05 +02:00
Detective Google 25d84a6317 brings the engioutpost ruin over as well 2020-05-02 17:44:23 -05:00
kevinz000 f028672e3c Merge remote-tracking branch 'citadel/master' into 91-files-changed-fml 2020-04-30 01:00:08 -07:00
Ghommie 2ff75d8c99 commenting lines. 2020-04-24 23:20:05 +02:00
Ghommie a9be1e06e2 Fixing stuff, it now should be ready. 2020-04-24 23:00:31 +02:00
Ghommie 58fc679cce WIP 2020-04-24 20:49:15 +02:00
Detective Google 71be8ed2fc ports all the tg junk for icemoon, not yet changed to make it all compile 2020-04-24 00:02:03 -05:00
Ghommie c93f028a97 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-21 01:53:41 +02:00
Ghom 64647318df Merge pull request #11883 from Putnam3145/fix-dynamic-on-by-default
Makes dynamic voting not the default
2020-04-18 05:47:21 +02:00
Ghommie 87a6bd013c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-17 21:57:21 +02:00
kevinz000 61f833b953 Merge pull request #11852 from Ghommie/Ghommie-cit681
Custom skin tone preferences.
2020-04-17 05:16:04 -07:00
Ghommie 4c6f1b622b Porting Goofconomy & co. 2020-04-17 07:48:11 +02:00
Putnam 874e57a516 Makes dynamic voting not the default 2020-04-16 16:14:22 -07:00
Ghommie 2200c690f7 configs 2020-04-16 18:44:05 +02:00
Linzolle 2cbd6d20ea come on 2020-04-14 18:28:11 -05:00