4ab08802a1
Merge pull request #9442 from YakumoChen/air-hog
...
Reverts jetpack efficiency from #9307
2019-10-11 12:08:44 -07:00
2e74833e72
Merge pull request #9444 from Thalpy/Updates-holder
...
[Testmerge first] [Ready] Cleans up holder.dm code and fixes some of the cross bugs from shotgun PR merging.
2019-10-11 12:08:12 -07:00
98d03c73be
Merge pull request #9459 from dapnee/Imagine-people-reading-code-to-see-if-it-forgets-something
...
Imagine Updating How Tables Work, But Forgetting MY TABLES
2019-10-11 12:05:53 -07:00
1896b43c79
Merge pull request #9451 from Ghommie/Ghommie-cit224
...
standarizes mobs' can_equip arguments.
2019-10-11 12:05:12 -07:00
9805e1b5fb
Merge pull request #9458 from Ghommie/Ghommie-cit228
...
Nerfs cyborg disabler to hold 25 shots rather than 43, just like a normal disabler.
2019-10-11 12:04:49 -07:00
dbcda948fb
Darn thing
2019-10-11 19:56:58 +01:00
60749f8b07
Adds a config option to determine the minimum alert level for secborgs (defaulting to red alert)
2019-10-11 14:33:32 -04:00
cd47412db2
Merge branch 'master' into Spookytime
2019-10-11 19:10:48 +01:00
7495de7d15
Update granters.dm
2019-10-11 14:04:08 -04:00
f165b5e813
darn nutrients.
2019-10-11 18:58:53 +01:00
bfd97a82ca
Eh 4 mins.
2019-10-11 18:56:33 +01:00
c51bfc153b
b
2019-10-11 13:24:00 -04:00
8f6c988536
Explod
2019-10-11 18:17:43 +01:00
8e71a20528
Oops
2019-10-11 18:16:25 +01:00
ae46b2932e
Bath is ready to go.
2019-10-11 18:15:46 +01:00
3009f8b2cc
Meow
2019-10-11 17:56:24 +01:00
d21f7f9a9b
Jacq fix
2019-10-11 15:26:39 +01:00
349b5f4369
GRUMBLING INTENSIFIES
2019-10-11 14:36:35 +01:00
3ae8581d96
HOPE
2019-10-11 14:34:40 +01:00
3e7131c7f6
Update wings.dm
2019-10-11 05:43:55 -04:00
55e7645773
updating branch
2019-10-11 04:55:57 -04:00
e517ece612
Darnit beaker
2019-10-11 08:41:08 +01:00
988a943f01
Try number 2
2019-10-11 02:36:10 -04:00
2286d40882
why am I making it ignore injections????
...
The world may never know
2019-10-11 01:34:26 -05:00
1b08c541e2
Update wings.dm
2019-10-10 21:11:48 -04:00
6b2a68f77a
Update code/modules/mob/living/carbon/human/species_types/furrypeople.dm
...
Co-Authored-By: Poojawa <Poojawa@users.noreply.github.com >
2019-10-10 21:09:28 -04:00
8b1e140fa0
Update code/__HELPERS/mobs.dm
...
Co-Authored-By: Poojawa <Poojawa@users.noreply.github.com >
2019-10-10 21:09:14 -04:00
618f8f30c5
Update code/__HELPERS/global_lists.dm
...
Co-Authored-By: Poojawa <Poojawa@users.noreply.github.com >
2019-10-10 21:09:09 -04:00
e85e499504
I forgot a part.
...
Copy-pasted the Angel's wings' bit of code to have something to show.
2019-10-10 20:45:38 -04:00
2822f43720
Update global_lists.dm
2019-10-10 20:32:25 -04:00
05fa19c856
Update mobs.dm
2019-10-10 20:32:24 -04:00
fef7dd4ac5
Update flavor_misc.dm
2019-10-10 20:32:22 -04:00
fb715ed955
Update create_mob.dm
2019-10-10 20:32:20 -04:00
a61fed2a73
Update preferences.dm
2019-10-10 20:32:19 -04:00
ce81e657b5
Update preferences_savefile.dm
2019-10-10 20:32:17 -04:00
2d84b541cf
Update wings.dm
2019-10-10 20:32:15 -04:00
0d5770f986
Update species.dm
2019-10-10 20:32:12 -04:00
e83460853c
Update furrypeople.dm
2019-10-10 20:32:09 -04:00
e734b36ee3
quickfixes lowpop nuclear war tc malus calculation.
2019-10-10 20:54:19 +02:00
2bce423ec3
Added a -ton- of stuff to the Kinkmate
2019-10-10 14:08:14 -04:00
293034d815
Imagine Updating How Tables Work, But Forgetting MY TABLES
...
## About The Pull Request
Let me just add in a single line so plasmaglass tables actually work.
## Changelog
🆑
fix: You can now make plasmaglass tables again.
/🆑
2019-10-10 09:04:06 -06:00
3e6415d4b5
Merge pull request #9324 from Linzolle/crusher
...
Ports "Adds toggleable light and blinking charging light to crusher" and "Lets the kinetic crusher be one-hand carried"
2019-10-10 02:23:15 -07:00
0f74a735cb
Merge pull request #9412 from Ghommie/Ghommie-cit213
...
Ports "Makes supermatter melt walls if it finds itself in one"
2019-10-10 02:21:32 -07:00
d9ff4235eb
Merge pull request #9447 from Ghommie/Ghommie-cit223
...
No digitigrade plasmaman suits sprites for the time being, thank you.
2019-10-10 02:20:45 -07:00
fda64df569
Merge pull request #9257 from Thalpy/Blind-quirk-without-anger
...
[READY] Blind quirk without anger
2019-10-10 02:19:17 -07:00
89747a3a6e
Merge pull request #9368 from Seris02/master
...
Fixes luminescent dark blue major effect and changes the "autoprocess" button to "autoclone"
2019-10-10 02:18:25 -07:00
6e029c3360
Merge pull request #9415 from Ghommie/Ghommie-cit214
...
Removes the minimum player cap for the war ops in favour or a more proportional telecrystal bonus.
2019-10-10 02:13:25 -07:00
fb028b7997
Merge pull request #9432 from Putnam3145/pandemic-qol
...
Made PanD.E.M.I.C beaker stuff more like ChemMaster
2019-10-10 02:12:41 -07:00
f791b399a0
Merge pull request #9446 from Sishen1542/ung
...
abscond can no longer be cast from inside a locker
2019-10-10 02:11:17 -07:00
c4f8956985
Merge pull request #9433 from Poojawa/hoss-tails
...
Corrects a missing tail state
2019-10-10 02:10:31 -07:00
kevinz000