Commit Graph

299 Commits

Author SHA1 Message Date
Ghommie
fde859bca0 Removing priority overlays, update_icon() splitup for guns. 2020-08-20 18:33:23 +02:00
Putnam
9bb3ba5c5a added ethereals 2020-08-08 00:08:43 -07:00
silicons
e4148fe4ad Merge remote-tracking branch 'citadel/master' into 12742 2020-07-29 01:11:11 -07:00
silicons
78312c23bf sigh 2020-07-28 21:53:07 -07:00
Lin
a5dd08a054 Merge pull request #12734 from silicons/shoelaces
shoelaces. untying people's shoelaces. admin smite to untie someone's shoelaces. credit to shaps/tg.
2020-07-28 21:51:43 -05:00
silicons
1990f75957 Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-25 23:46:27 -07:00
silicons
e3b8c212f1 ok 2020-07-25 23:14:38 -07:00
silicons
1f25c7f06d Merge remote-tracking branch 'citadel/master' into shoelaces 2020-07-23 16:23:34 -07:00
silicons
d30acd5b09 smooth 2020-07-23 13:49:17 -07:00
silicons
c3ca4be149 ok 2020-07-23 13:47:07 -07:00
silicons
95cd7c6571 fix 2020-07-23 11:46:46 -07:00
silicons
89a1fa544e fixes 2020-07-23 10:12:34 -07:00
Keate Senior
fafde35ee2 Fixes the Arks looping issue, and gives Ratvar new words when fighting
Also removes the grace period variable since the ark activates immediately now /shrug
2020-07-23 12:59:40 -04:00
silicons
21d57eeeac sigh 2020-07-23 00:27:45 -07:00
silicons
3a38344a04 fix 2020-07-23 00:25:06 -07:00
silicons
910290edcf buffers 2020-07-23 00:22:33 -07:00
silicons
76f885e1a6 ok 2020-07-23 00:16:43 -07:00
silicons
184e3992f3 fixes 2020-07-21 11:56:23 -07:00
silicons
4d48abf3a6 fixes 2020-07-21 11:46:17 -07:00
silicons
f3efa19436 Merge remote-tracking branch 'citadel/master' into 12742 2020-07-21 11:25:26 -07:00
silicons
1450b11b01 sigh 2020-07-20 21:37:44 -07:00
silicons
984796b8c6 sigh 2020-07-20 10:46:52 -07:00
silicons
58e26c540c merge from master 2020-07-20 10:18:44 -07:00
Keate Senior
21af6d4805 same as last commit but I actually stage all the right files 2020-07-20 03:20:13 -04:00
silicons
ae83a6df02 fix 2020-07-19 19:51:17 -07:00
silicons
910869d6bf more 2020-07-18 19:44:12 -07:00
silicons
0b98b0409b sigh 2020-07-18 18:29:09 -07:00
silicons
484da28600 Merge branch 'master' into shoelaces 2020-07-16 17:31:41 -07:00
silicons
de8ac9896a sigh 2020-07-11 07:13:56 -07:00
silicons
cc2e9530b1 fix 2020-07-11 00:44:17 -07:00
silicons
8d5d194a26 hahahahaha 2020-07-11 00:30:56 -07:00
Artur
6ee1eba56c Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-02 23:23:47 +03:00
Ghommie
a34a7ba5d4 You can't (un)equip garments on/from obscured inventory slots anymore. 2020-06-28 01:10:22 +02:00
Artur
c41d2e78be Conflicts!!! 2020-06-22 17:39:24 +03:00
Timothy Teakettle
4c55e86da7 part 2 2020-06-10 23:14:25 +01:00
Artur
19f215477e Merge remote-tracking branch 'upstream/master' into TGUI-3.0 2020-05-30 18:52:02 +03:00
Ghom
968426fd48 Combat mode component. (#12338)
* Combat mode component.

* Whoops.

* test.

* Oh

* refs begone, and documentation.
2020-05-27 18:00:32 -07:00
Rohesie
d88c815845 vars (#12373) 2020-05-28 01:18:26 +02:00
Ghom
07df0102f8 Demodularizing a few reagents, a client var, the rest hud button. (#12329) 2020-05-24 13:21:14 -07:00
kevinz000
e9068f05eb let's play the optimization game featuring lighting (#12310)
* debug proc

* kinda quirky

* let's play the lighting game

* let's play the macro game

* let's play the refactor game

* let's play the optimization game

* let's play the optimization game x2

* yeehaw

* e

* let's play the memory game

* fix

* lighting fix

* sanitization and checks

* mh

* hotkeys fix

* ok
2020-05-23 22:47:42 +02:00
Artur
9d04b0835b Conflicts galore 2020-05-21 21:08:12 +03:00
Ghom
335f5a37b9 Plane adjustments on several low layer objects. (#12286) 2020-05-17 17:02:57 -07: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
kevinz000
10944d1b52 The bag of holding (and I guess backpack) balancing pass no one asked for (#11864)
* Ok

* whew

* ok

* fix

* ehh

* fix

* buff disks

* Update _compile_options.dm

* Update tgstation.dme
2020-05-15 03:44:56 +02:00
Artur
5b7d9a9008 Merge conflict fix 2020-05-13 12:37:18 +03:00
Ghommie
88d86e53d0 Porting some radial menu updates, and that one clown mask. 2020-05-09 00:45:48 +02:00
Putnam
c1cd4d104f Replaces the pAI candidate button with a ghost roles button 2020-05-03 20:31:11 -07:00
kevinz000
f99d904dc7 ports /tg/station vis_flags related fixes (#12064)
* fixes

* Update layers_planes.dm

* kay
2020-05-01 21:14:04 +02:00
Artur
803efebf65 https://github.com/tgstation/tgstation/pull/49960 Port 2020-04-23 12:45:50 +03:00
Ghommie
42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00