kevinz000
1a9787a9c2
Merge remote-tracking branch 'citadel/master' into combat_rework
2020-06-02 21:49:43 -07:00
Ghom
ea763df326
Photosynthesis element. ( #12394 )
...
* Photosynthesis element.
* element yaketi sax.
* Ok, let's just use SSobj which has 20 wait instead of 10.
2020-06-02 15:23:09 -07:00
kevinz000
05fe0c7dcc
ok
2020-05-30 00:59:29 -07:00
kevinz000
f63bc2e2d3
flags
2020-05-30 00:42:41 -07:00
kevinz000
65bb3bbb91
Merge remote-tracking branch 'citadel/master' into combat_rework
2020-05-29 19:13:22 -07:00
kevinz000
92a537da63
Damage fix
2020-05-29 19:12:46 -07:00
Rohesie
5ab8d41d9a
horns ( #12384 )
2020-05-30 03:25:27 +02:00
kevinz000
162e79df23
fixes dreamchecker errors
2020-05-27 18:17:00 -07:00
kevinz000
433bd1af79
Merge remote-tracking branch 'citadel/master' into combat_rework
2020-05-27 18:11:15 -07: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
Lin
54bd506184
Merge pull request #12361 from Ghommie/Ghommie-cit794
...
Fixing some blindness stuff and visible messages.
2020-05-27 22:39:55 +00:00
kevinz000
dc3f02dbfb
let's make it pretty
2020-05-27 00:08:00 -07: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
Ghommie
841bb86181
Fixing blindness stuff.
2020-05-25 16:10:25 +02:00
kevinz000
e4eb49050c
Merge remote-tracking branch 'citadel/master' into combat_rework
2020-05-24 15:03:06 -07:00
kevinz000
95c6c7345c
implementations
2020-05-24 14:56:01 -07:00
Ghom
9fef1b62e1
Removing duplicate total item attack force modifiers. ( #12342 )
2020-05-24 13:12:44 -07:00
Ghom
bcd911070a
Fixing dwarfism. ( #12331 )
...
* Update body.dm
* Update dwarves.dm
2020-05-21 12:38:42 -07:00
Ghom
6696560656
slendermen fix. ( #12303 )
...
* slendermen fix.
* Whops
* Update dwarfism.dm
2020-05-20 18:43:14 -07:00
kevinz000
b57e1c1e93
Rebindable Hotkeys ( #12138 )
...
* demodularize interface
* keybindings
* binds
* prefs
* loose ends
* globals
* changes
* s
* datum ref lists
* ok
* fixes
* fixes
* fix
* ok
* sigh
* sigh
* indicators
* let's play the move code around game
* let's play the i didn't comma my lists game
* let's play the indent game
* let's play hte spelling bee
* let's fail the spelling bee
* LET'S PLAY THe HOW HARd IS IT TO SPELL A PROC GAME
* let's play the bugfix game
* bugfixes
* improvements
* Update bindings_client.dm
* pixel shift
* A
* wups
2020-05-20 23:40:20 +02:00
Ghom
f624ce5fd4
Update species.dm ( #12295 )
2020-05-18 04:49:42 -07:00
Ghom
08392c7ae7
Fixing horns/wings colors not being loaded, and another couple misc issues. ( #12287 )
...
* Fixing horns/wings colors not saving up and another couple misc issues.
* Typos.
* accidental paste
2020-05-18 04:47:19 -07:00
Ghom
9eccef2836
Porting "Personal interaction messages to simple animals" and more. ( #12268 )
...
* Porting "Personal interaction messages to simple animals" and more.
* Travis check.
* doc
* whoopsie.
* )
2020-05-18 04:46:57 -07:00
Ghom
75dec8ce2c
Ports "Removes the absolute istype fest from footsteps" ( #12259 )
...
* Ports "Removes the absolute istype fest from footsteps"
* Update species.dm
2020-05-18 04:46:22 -07:00
Ghom
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
Ghom
12ac08d7c5
Porting tesla/electrocute code updates. ( #12280 )
...
* Porting tesla/electrocute code updates.
* Why is the dominator being insta-deleted by zaps a good idea?
* Yikes.
* ah
2020-05-17 16:35:17 -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
Ghom
9d2399ce9f
Removing unused files and fixing some stuff. ( #12250 )
2020-05-15 07:15:15 -07:00
Arturlang
ada31990d0
Fixes prosthetic causing bloodsuckers to bug out ( #12136 )
...
* Fixes prosthetic causing bloodsuckers to bug out
* Moved it per ghommies suggestions
2020-05-14 13:44:48 +02:00
Lin
0d92783a91
oops. ( #12242 )
2020-05-14 00:22:57 +02:00
Lin
2dedf0d6b6
Merge pull request #12015 from kevinz000/typing_indicators
...
Typing Indicators (v2)
2020-05-13 18:19:26 +00:00
Lin
fd30edca9c
infinixeno ( #12234 )
2020-05-13 03:18:25 +02:00
kevinz000
81424914e6
Merge pull request #12215 from Trilbyspaceclone/patch-377
...
Adds more ballmer lines
2020-05-12 12:35:05 -07:00
kevinz000
395d434e6e
Merge pull request #12200 from Ghommie/Ghommie-cit738
...
nutrition adjustment wrapper procs from tg.
2020-05-12 12:28:02 -07: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
Trilbyspaceclone
95330e4baf
Update life.dm
2020-05-11 17:17:04 -04:00
Trilbyspaceclone
c14197bd1b
Update life.dm
2020-05-11 17:16:10 -04:00
Trilbyspaceclone
0df3483d6f
Update life.dm
2020-05-11 17:15:29 -04:00
Trilbyspaceclone
8fa1a0ba58
Update life.dm
2020-05-11 15:48:01 -04:00
Trilbyspaceclone
720abbf1c5
Update life.dm
2020-05-11 15:21:49 -04:00
Trilbyspaceclone
1e5cce73d9
Update life.dm
2020-05-11 15:19:39 -04:00
kevinz000
dbfa8ac1ea
Merge branch 'master' into typing_indicators
2020-05-11 05:00:23 -07:00
kevinz000
f292d4047c
Adds OOC notes ( #12067 )
...
* ooc notes
* fixes
* repath
* ok
* This SHOULD compile, or else...
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-05-11 01:35:48 +02:00
kevinz000
7cfbdf3a1d
Update human.dm ( #12203 )
2020-05-10 23:51:49 +02:00
kevinz000
1cf2311930
Merge pull request #12164 from Ghommie/Ghommie-cit733
...
Porting "Refactors language holder"
2020-05-10 14:16:42 -07:00
Ghommie
667c12d413
nutrition adjustment wrapper procs.
2020-05-10 21:41:50 +02:00
Lin
dd7db603d2
Merge pull request #12159 from Ghommie/Ghommie-cit732
...
'mob_run_block' and 'mob_check_block' macros
2020-05-10 18:25:16 +00:00
Seris02
381333bf82
a ( #11873 )
2020-05-09 02:15:41 +02:00
Ghommie
2858ddd90b
Porting "Refactors language holder"
2020-05-08 22:44:02 +02:00
Ghommie
ffd5dd9615
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit732
2020-05-08 19:01:28 +02:00