a9f103fb34
removes unused bottle, kicks travis?
2020-02-17 15:28:10 -08:00
0fa679771b
fix indentation
...
muh spaces
2020-02-17 17:46:47 -05:00
6e32a466af
tweak mesmerize
...
range increased
added a "windup"
hardstun length increased to counteract windup
windup allows target to attempt to avoid via breaking line of sight at the time the windup completes
initial stun reduced to major slowdown, user also recieves slowdown to prevent sprint memes from just letting them follow around a corner if there is one
2020-02-17 17:24:09 -05:00
8f653b4dd6
Update materials.dm
2020-02-17 15:48:31 -05:00
3b82e34db6
Update code/modules/cargo/packs/emergency.dm
...
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-02-17 15:48:02 -05:00
b9b7e27bcb
Merge pull request #11114 from Psody-Mordheim/Plzgibsynthflesh
...
Revenge Of Synthflesh : Electric Boogalo Part 2
2020-02-17 16:17:27 +01:00
eddefd4d25
Update large_objects.dm
2020-02-17 15:07:17 +01:00
217661184d
nerf'd
2020-02-17 21:29:34 +08:00
5dc271124a
Something about tesla revolvers and tk.
2020-02-17 14:29:14 +01:00
a2583f5f7f
Update expressconsole.dm
2020-02-17 14:25:50 +01:00
79705d1716
Moving Burgers Around
2020-02-17 08:24:21 -05:00
5e10f822e6
Update energy.dm
2020-02-17 13:40:37 +01:00
28a589d2d1
diethylamine > ammonia
2020-02-17 04:32:39 -08:00
ffe1c794eb
Changes cult stunhand when halos are out ( #11053 )
...
* Changes cult stunhand when halos are out
Turns the stunhand into a burn + knockback hand. So it remains more defensive than offensive.
* Changes the desc a little
Changes it to "When the cult ascends, so does the spell, it burns and throws back the victim" Thanks Justin!
* Requested changes
Requested changes
2020-02-17 13:29:51 +01:00
b271096b77
rest key, v, version two ( #11090 )
...
* maybe
* skreeeee
* yes
* fucccccccccck
* happy now
* Update interface.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-02-17 12:47:19 +01:00
dc6d1fb359
Sorted Frozen Foods
2020-02-17 05:56:02 -05:00
c97111beda
Reorganise Food + Balance Tweaks
...
-Reorganised -ALL- foods in the crafting menu.
-Made a section for Eastern Dishes, Mexican Dishes, and Sweets
-Made Bowls, Salads, Soups, Eggs Benedict, and Omelettes normal sized.
-Moved Easter Recipies to the food files, fixing it in the process.
-Capitalised a few things.
2020-02-17 05:32:03 -05:00
78fad64d56
this is no longer necessary
2020-02-16 15:54:41 -08:00
a4a5efbc11
ghommble's other changes
2020-02-16 15:48:22 -08:00
262b4d95fb
Update projectile.dm
2020-02-16 16:44:29 -07:00
3ecd1b75d4
ghommald's changes
2020-02-16 15:32:05 -08:00
c5eaac62bd
Update materials.dm
2020-02-16 18:26:22 -05:00
0315802330
Update armory.dm
2020-02-16 18:25:54 -05:00
aba636a44c
ok
2020-02-17 00:13:16 +01:00
794aeb81c2
Merge pull request #11060 from kevinz000/stuff
...
guns and cult blood magic now respect stamina softcrit
2020-02-16 13:20:56 -06:00
0f7618b348
Update organic.dm
2020-02-16 14:07:00 -05:00
a37e1ab129
Merge pull request #11093 from Ghommie/Ghommie-cit580
...
Something about blood and species handle_chemicals()
2020-02-16 12:36:41 -06:00
1a0fba8a2a
Something about consistency and magnetic rifles.
2020-02-16 18:37:51 +01:00
c0295156ff
Adds synthmeat reaction
2020-02-16 11:42:30 -05:00
3286f43d90
Didnt know I could make it a subtype
2020-02-16 11:17:54 -05:00
23ae9996d2
Something more about runtime errors.
2020-02-16 15:24:15 +01:00
313f544aee
Make it require some heating
2020-02-16 08:34:08 -05:00
38f32d28b7
Mixable Synthblood
2020-02-16 08:06:22 -05:00
f4734e44f0
o ye this should be something else
2020-02-16 07:52:34 -05:00
f0b3021f5d
I miss my powergame
2020-02-16 07:41:26 -05:00
206e546254
reordering these designs
2020-02-16 04:15:50 -08:00
379c914099
Merge pull request #10704 from Ghommie/Ghommie-cit529
...
More Runtimenator fixes.
2020-02-16 05:10:19 -07:00
14e41e8d68
adds diethylamine and saltpetre to the biogenerator
2020-02-16 03:52:07 -08:00
5c2e244ee0
Ports /tg/ pr #44529 , reverts #9092
2020-02-16 22:20:50 +11:00
1d9982d00a
Virology support for synthetic blood and some blood subtypes removal.
2020-02-16 10:36:16 +01:00
3fde58434f
Merge branch 'master' into more_implants
2020-02-16 01:55:19 -05:00
21e2a0892d
Update meat.dm ( #11028 )
2020-02-16 07:46:45 +01:00
a8d45f8361
Update crab.dm ( #11105 )
2020-02-16 07:39:56 +01:00
14fdd90618
Nerfs public autolathes ( #10970 )
2020-02-16 07:37:24 +01:00
a5f06430e4
repulse armor sanity ( #10949 )
2020-02-16 07:36:50 +01:00
c95bb9f8db
FUCK SHIT I'M NAKED IS THIS A DREAM OR REAL FUCK FUCK WHERE ARE MY CLOTHES hallucination ( #10857 )
...
* FUCK SHIT I'M NAKED IS THIS A DREAM OR REAL FUCK FUCK WHERE ARE MY CLOTHES????
* fix
* no more getflaticon dabdabdabdabdabdabdab
* tada
2020-02-16 07:31:30 +01:00
abf7d2423a
Update death.dm
2020-02-16 07:17:53 +01:00
18feba7fdd
Defusal kits are now emag only and don't require a drop pod console.
2020-02-16 00:14:15 -05:00
23a9b9b438
Master got fixed while I was at work!
2020-02-16 00:07:24 -05:00
cba6667332
it could work
2020-02-15 18:42:50 -05:00
Cameron!