Commit Graph
243 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 afe32406c0 Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT 2020-08-22 13:40:36 +08:00
Enric Gabriel b0cf18fc5a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-20 13:29:24 -03:00
Letter N 3b7bca28b3 Functional* code 2020-08-20 13:50:33 +08:00
siliconsandGitHub 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
SandPootandGitHub 66541bbe67 Adds tgstation's fix air for admins (#49) 2020-08-17 14:55:59 -03: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
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
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
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
Artur 280d3de6c3 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-07 18:37:45 +03:00
Enric Gabriel 83522c8571 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-04 17:18:13 -03:00
GhomandGitHub 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
siliconsandGitHub 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
Enric Gabriel a7ce0b7ece Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-06-29 17:35:25 -03:00
siliconsandGitHub c88b7721ad Update policy.dm 2020-06-29 05:03:45 -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 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
Enric Gabriel cb261a1b74 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-06-17 20:23:21 -03:00
SmArtKar 46c3e9e54d Shuttles 2020-06-16 18:16:14 +03:00
Artur ceba739231 Cooonflicts 2020-06-16 01:23:42 +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
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
Enric GabrielandGitHub c6c341db2f Toggle disk msg (#12) 2020-05-20 04:10:01 -03:00
Enric Gabriel 4d66452c27 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-05-18 13:20:31 -03:00
GhomandGitHub 20ac2f26f4 Demodularizing the gear loadout code a little. (#12261) 2020-05-18 04:45:50 -07: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
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
Putnam3145andGitHub e1d113b970 Config for antag forcing (#12171) 2020-05-10 21:35:20 +02:00
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
Ghommie a194d7dafe merge conflict and job/dept discounts support. 2020-05-03 02:11:05 +02:00