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
kappa-sama
fc0ac23eed
slight modifications to soda/booze dispenser emag reagents ( #12174 )
...
* these
* coom.
* move
* Update code/modules/reagents/chemistry/machinery/chem_dispenser.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
* Update code/modules/reagents/chemistry/machinery/chem_dispenser.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-05-14 04:27:19 +02:00
kevinz000
4aca1e8f62
Update medicine_reagents.dm ( #12233 )
2020-05-13 04:20:05 +02: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
Ghommie
667c12d413
nutrition adjustment wrapper procs.
2020-05-10 21:41:50 +02:00
Putnam3145
c20c7f0698
Removes crocin, hexacrocin from emagged booze dispenser; makes crocin no longer "roofies" (??) ( #12177 )
...
* Removes crocin, hexacrocin from emagged booze dispenser
* what. what. what. what. what.
2020-05-09 14:34:30 +02:00
Ghommie
aaa31c24ce
Demodularizing a few sprite assets.
2020-05-08 04:02:31 +02:00
Trilbyspaceclone
106fb6496e
Update hypospray.dm
2020-05-06 05:30:54 -04:00
Ghommie
b2a20d5438
reducing some prices as training wheel.
2020-05-03 05:37:04 +02:00
Ghommie
a194d7dafe
merge conflict and job/dept discounts support.
2020-05-03 02:11:05 +02:00
Ghommie
b383066e57
Replacing the MATERIAL_NO_EFFECTS flag with MATERIAL_EFFECTS.
2020-05-02 00:00:49 +02:00
TrilbySpaceClone
5d6da47db7
Merge branch 'master' into medical-witchcraft
2020-04-27 07:25:18 -04:00
kevinz000
a533906f73
Merge pull request #11992 from Ghommie/Ghommie-cit703
...
reagents value nerf and standardization.
2020-04-25 16:54:14 -07:00
kevinz000
4689e2aeb6
Merge pull request #11980 from Ghommie/Ghommie-cit700
...
Movespeed modifiers refactor port.
2020-04-25 16:51:14 -07:00
Ghommie
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
Ghommie
a97c2f66a5
Putnam's suggestions.
2020-04-24 03:44:12 +02:00
Ghommie
0beb28d3bb
reagents value nerf and standardization.
2020-04-23 19:52:22 +02:00
TrilbySpaceClone
c8b3032087
Merge branch 'master' into cube-world
2020-04-23 02:04:56 -04:00
Ghommie
42201343a9
Backward 512 compatibility removal.
2020-04-23 00:59:23 +02:00
Ghommie
63870cc9d1
Movespeed modifiers refactor port.
2020-04-22 22:01:39 +02:00
Ghom
9b27f1f6ec
Merge pull request #11922 from Trilbyspaceclone/patch-345
...
Nerfs most soda and reagents
2020-04-22 03:31:32 +02:00
Ghom
5a6a205b9d
Merge pull request #11868 from Arturlang/tackling_and_lunge
...
Ports TG Tackling and uses it to rework bloodsucker lunge
2020-04-21 15:50:44 +02:00
Ghommie
c93f028a97
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
2020-04-21 01:53:41 +02:00
Timothy Teakettle
c5b8c45bf0
Merge branch 'master' into food-quality
2020-04-20 19:53:39 +01:00
TrilbySpaceClone
25b1b889dc
amazing truely amazing
2020-04-19 19:09:20 -04:00
TrilbySpaceClone
37a0fb558c
with fixes and new gauze
2020-04-19 15:29:48 -04:00
Trilbyspaceclone
42b81fee3d
Update drink_reagents.dm
2020-04-18 21:57:36 -04:00
Trilbyspaceclone
a5b7f506f9
Update chem_dispenser.dm
2020-04-18 16:42:46 -04:00
Trilbyspaceclone
63524b47c3
Why is ice and water so filling?
2020-04-18 16:28:51 -04:00
Trilbyspaceclone
26facfa37a
honey changes + complie
2020-04-18 16:24:05 -04:00
Trilbyspaceclone
54cce75679
Update food_reagents.dm
2020-04-18 16:15:40 -04:00
TrilbySpaceClone
344c8b1334
Hmm
2020-04-18 08:28:14 -04:00
Ghom
6da088f4ea
Merge pull request #11871 from kappa-sama/patch-20
...
minor nerf to aranesp's stamina regen
2020-04-18 02:07:28 +02:00
Ghommie
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
Timothy Teakettle
cd25a7c145
Merge branch 'master' into food-quality
2020-04-17 15:03:44 +01:00
kevinz000
e84e6bface
Merge pull request #11857 from Trilbyspaceclone/race_drinks
...
Race drinks!
2020-04-17 05:20:53 -07:00
Ghommie
4c6f1b622b
Porting Goofconomy & co.
2020-04-17 07:48:11 +02:00
timothyteakettle
a4cc54781f
implements isfood helper
2020-04-17 01:45:15 +01:00
Timothy Teakettle
aa6d6883e3
remove a random 'r'
2020-04-17 01:34:46 +01:00
kappa-sama
a41b5d7fac
better description
2020-04-15 15:41:30 -04:00
kappa-sama
fc24574b52
minor nerfies
2020-04-15 15:37:57 -04:00
Trilbyspaceclone
742654b1d2
Update alcohol_reagents.dm
2020-04-15 10:44:51 -04:00
Artur
2134515d5c
Merge remote-tracking branch 'upstream/master' into tackling_and_lunge
2020-04-15 12:19:37 +03:00
TrilbySpaceClone
d49210fd48
Merge branch 'master' into race_drinks
2020-04-14 19:21:47 -04:00
TrilbySpaceClone
a46a6227a9
Finally done...
2020-04-14 19:11:53 -04:00
Ghommie
571584901c
Custom skin tone preferences.
2020-04-14 19:10:28 +02:00
TrilbySpaceClone
79a72a50d4
this is annoying, why is angel not defind as a race
2020-04-14 11:13:49 -04:00
Artur
f910a0fd32
Conflict fixes
2020-04-14 09:27:54 +03:00
Timothy Teakettle
e024393962
secret sauce doesn't give a second moodlet because that's dumb
2020-04-13 17:12:40 +01:00
