6ee1eba56c
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-07-02 23:23:47 +03:00
20245f7319
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-06-30 02:30:29 +03:00
9dc4b99620
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
2020-06-30 00:49:06 +02:00
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
de77b7139c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
2020-06-23 00:13:14 +02:00
c41d2e78be
Conflicts!!!
2020-06-22 17:39:24 +03:00
1b5ea90c8f
sigh
2020-06-18 08:16:05 -07:00
46c3e9e54d
Shuttles
2020-06-16 18:16:14 +03:00
390419cfaa
Stupid mistake
2020-06-16 17:21:46 +03:00
19f215477e
Merge remote-tracking branch 'upstream/master' into TGUI-3.0
2020-05-30 18:52:02 +03:00
1bca74465f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
2020-05-30 03:29:02 +02:00
e51ac4e745
Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event.
2020-05-29 17:58:35 +02:00
292f1afa3c
Quick bandaid for table telescreens/buttons. ( #12339 )
2020-05-24 13:13:20 -07:00
9d04b0835b
Conflicts galore
2020-05-21 21:08:12 +03:00
30ab79e09e
Porting the twohanded component.
2020-05-17 18:16:53 +02:00
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
1682cfd3fd
Compile
2020-05-13 13:52:12 +03:00
dabdf16eac
Coonflict fiiixeeess
2020-05-13 12:56:17 +03:00
5b7d9a9008
Merge conflict fix
2020-05-13 12:37:18 +03:00
8458f97692
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real
2020-05-12 13:34:31 -07:00
395d434e6e
Merge pull request #12200 from Ghommie/Ghommie-cit738
...
nutrition adjustment wrapper procs from tg.
2020-05-12 12:28:02 -07:00
e8d7da56f4
Ported C++mos from yogs (help me)
2020-05-11 15:44:26 -07:00
667c12d413
nutrition adjustment wrapper procs.
2020-05-10 21:41:50 +02:00
a194d7dafe
merge conflict and job/dept discounts support.
2020-05-03 02:11:05 +02:00
94f014589d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
2020-04-25 17:09:34 +02:00
e0a51903a1
Not yet implemented design security level requirements.
2020-04-24 00:51:04 +02:00
120615d472
Ports https://github.com/tgstation/tgstation/pull/44525 , and
...
And fixes to make stuff work
2020-04-23 17:36:13 +03:00
1d51b6a8c8
Ports https://github.com/tgstation/tgstation/pull/45444/
2020-04-23 15:08:24 +03:00
9d870893fb
Beginning work on DNA console TGUI, plus some camera console fixes
2020-04-23 13:24:43 +03:00
67e0b95407
Shuttle stuffs and gateway refactor port https://github.com/tgstation/tgstation/pull/49868/
2020-04-23 12:36:42 +03:00
80b47ec1c0
Ports https://github.com/tgstation/tgstation/pull/50497
2020-04-23 09:55:28 +03:00
42201343a9
Backward 512 compatibility removal.
2020-04-23 00:59:23 +02:00
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
4c6f1b622b
Porting Goofconomy & co.
2020-04-17 07:48:11 +02:00
d0d766efb5
Some balance alterations to make pugilism actually worth a damn, lets you craft armwraps (magic ones too if you want to go to the effort), and also buffs some stamina damage on various martial arts
2020-04-15 19:00:01 +10:00
f5852424e3
Merge pull request #11812 from Auris456852/master
...
Adds admin printer noise for Centcomm/Syndicate messages
2020-04-12 06:25:52 +02:00
230e5fca20
fix everything
2020-04-11 15:32:09 +08:00
03f583e5ff
Adds admin printer noise for Centcomm/Syndicate messages
2020-04-10 18:50:52 +03:00
956a85ab34
Merge pull request #11741 from necromanceranne/pawnch_2_the_pawnchening
...
Punch Changes 2: The Quickening
2020-04-09 02:09:51 -07:00
33a056b373
Merge branch 'master' into pawnch_2_the_pawnchening
2020-04-06 12:29:14 +10:00
e2d2f5a4ad
Update minesweeper.dm
2020-04-04 14:04:47 +02:00
3c9a9136b5
Update minesweeper.dm
2020-04-04 13:46:21 +02:00
010ddb2bfb
Merge pull request #11706 from Ghommie/Ghommie-cit660
...
Minesweeper armageddon improvements
2020-04-03 21:55:16 -07:00
0c46c151f9
Changes the vast majority of punching to be more changable with gear, martial arts now utilize species punch values for damage.
2020-04-03 19:42:25 +11:00
73c52c0c6e
Accurate minefield.
2020-04-01 05:19:29 +02:00
04c8cb09a4
out of bounds coordinates sanity
2020-04-01 04:41:21 +02:00
736760ac06
Minesweeper oopsies etcetera.
2020-04-01 04:39:36 +02:00
abde27c098
layer changes
2020-03-28 23:50:08 -07:00
17f4b0f34f
I assume this works
2020-03-26 17:46:41 +08:00
ea8941343e
stops validhunting geneticists from knowing exactly who is an is a vampire (and allows vampires genes) ( #11520 )
...
* yeet gone
* pfft oof
* oof
2020-03-19 13:40:11 +01:00
Artur