5f9364c5f8
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
2020-07-13 16:20:54 +03:00
a625d6562b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real
2020-07-08 22:02:03 -07:00
19f215477e
Merge remote-tracking branch 'upstream/master' into TGUI-3.0
2020-05-30 18:52:02 +03:00
ce1f1bdf5e
Turning a few components into elements. ( #12325 )
...
* Turning a few components into elements.
* eh
2020-05-24 13:06:27 -07:00
9d04b0835b
Conflicts galore
2020-05-21 21:08:12 +03:00
08280a853e
Renames 'visible_atoms' and 'get_actual_viewers' procs to 'fov_view' and 'fov_viewers' ( #12282 )
...
* Renames 'visible_atoms' and 'get_actual_viewers' procs to 'fov_view' and 'fov_viewers'
* Ok, signals.
2020-05-17 17:04:15 -07: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
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
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
e8d7da56f4
Ported C++mos from yogs (help me)
2020-05-11 15:44:26 -07:00
c2e689aec0
i'm salty ( #12181 )
2020-05-10 21:33:56 +02:00
f770586407
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit723
2020-05-05 05:09:29 +02:00
643ef48f0e
Macros, generic skill implementations.
2020-05-05 04:42:34 +02:00
65104be982
rad collectors now announce when empty
2020-05-02 18:55:58 +10: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
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
4c6f1b622b
Porting Goofconomy & co.
2020-04-17 07:48:11 +02:00
18471be4ce
cult team
2020-03-10 20:11:18 -07:00
59b1a223a3
Ok, done.
2020-03-08 22:51:36 +01:00
f6542b381c
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-21 23:29:25 -07:00
6a8a606f97
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-04 16:01:25 -07:00
a726f09201
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-04 03:54:52 +01:00
95db5084ab
Screw commit history.
2020-02-02 01:26:04 +01:00
8923810de2
Something about runtime errors.
2020-02-01 07:19:49 +01:00
611fd7ea89
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-01-27 23:35:35 -07:00
8f60d01208
Merge remote-tracking branch 'citadel/master' into kevinz000-patch-8
2020-01-20 22:47:21 -07:00
f85527ab4b
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-01-19 16:18:12 -07:00
088e586b47
Merge pull request #9601 from Ghommie/Ghommie-cit265
...
Ports move force and move resist, movement/pushing/pulling tweaks & co.
2020-01-19 16:10:56 -07:00
536900a7ac
Merge pull request #10520 from Hatterhat/tg-40920
...
you like examining things? - port of tgstation 40920
2020-01-19 16:37:40 +01:00
590d71ddc1
hey ghom i fixed it i think
2020-01-18 23:35:52 -06:00
9c0b78bc09
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2020-01-18 01:23:08 +01:00
7bcb37c5d1
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-01-16 21:12:56 -07:00
9aedc62ddb
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tg-40920
2020-01-12 12:39:17 -06:00
c14439494a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2020-01-12 19:18:03 +01:00
02fbbd4f95
Ouch.
2020-01-12 16:54:08 +01:00
16a37e2769
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
080cb74893
tgstation 40920 tweaked and tested for cit
2020-01-10 22:56:11 -06:00
4599abde4a
Merge pull request #10420 from MrJWhit/radiation-plasma-usage
...
Increase radiation plasma usage in radiation collector
2020-01-06 19:46:42 -08:00
7378d91684
([\W\.])Knockdown\(
2020-01-06 03:39:20 -08:00
198b1d5bd4
Update emitter.dm
2020-01-05 15:01:58 -08:00
44b96f01ea
Make radiation collectors move faster
...
Words
2020-01-03 06:04:10 -05:00
9db79ff958
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2019-12-20 23:40:21 +01:00
93fbc17428
ports "Standardize obj/updateicon() and update_icons() to update_icon()"
2019-12-16 17:58:50 +01:00
542c9007ee
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2019-12-06 20:09:35 +01:00
dd101ef221
Part 2
2019-11-19 18:00:56 +01:00
6484eea339
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2019-11-15 00:36:50 +01:00
8f08e1017e
Merge pull request #9688 from Ghommie/Ghommie-cit306
...
Fixing gibspawner runtimes and improving them, how gruesome...
2019-11-14 15:51:20 -07:00
Artur