Commit Graph

10676 Commits

Author SHA1 Message Date
kevinz000 d33b866805 Merge pull request #9467 from deathride58/compscithree
[s] fixes client analyzation having cid and ip swapped
2019-10-11 12:34:25 -07:00
deathride58 a2f5395b39 [s] fixes the client analyzation having cid and ip swapped 2019-10-11 15:16:35 -04:00
kevinz000 46994f2475 Merge pull request #9448 from MrJWhit/zombie-eyes
Makes zombie smell through their eyes
2019-10-11 12:16:06 -07:00
kevinz000 e717272129 Merge pull request #9450 from JTGSZ/offsets4stuff
Adds more control over species based offsets
2019-10-11 12:13:19 -07:00
kevinz000 0643a7b230 Merge pull request #9387 from Sishen1542/goose
the geese have been unleased
2019-10-11 12:11:50 -07:00
kevinz000 b0b274762c Merge pull request #9441 from lolman360/whydowehave1000branches
Ports /tg/ advanced surgerytools and tool defines.
2019-10-11 12:10:31 -07:00
kevinz000 9cd75c82a4 Merge pull request #9435 from Linzolle/firefix
fix fireman carry offhand not automatically deleting itself
2019-10-11 12:09:14 -07:00
kevinz000 620af601b2 Merge pull request #9437 from JTGSZ/clothingrestrictions
Optional Species based clothing restrictions
2019-10-11 12:08:57 -07:00
kevinz000 4ab08802a1 Merge pull request #9442 from YakumoChen/air-hog
Reverts jetpack efficiency from #9307
2019-10-11 12:08:44 -07:00
kevinz000 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
kevinz000 1896b43c79 Merge pull request #9451 from Ghommie/Ghommie-cit224
standarizes mobs' can_equip arguments.
2019-10-11 12:05:12 -07:00
kevinz000 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
Fermi dbcda948fb Darn thing 2019-10-11 19:56:58 +01:00
deathride58 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
Fermi cd47412db2 Merge branch 'master' into Spookytime 2019-10-11 19:10:48 +01:00
Fermi f165b5e813 darn nutrients. 2019-10-11 18:58:53 +01:00
Fermi bfd97a82ca Eh 4 mins. 2019-10-11 18:56:33 +01:00
Sishen c51bfc153b b 2019-10-11 13:24:00 -04:00
Fermi 8f6c988536 Explod 2019-10-11 18:17:43 +01:00
Fermi 8e71a20528 Oops 2019-10-11 18:16:25 +01:00
Fermi ae46b2932e Bath is ready to go. 2019-10-11 18:15:46 +01:00
Fermi 3009f8b2cc Meow 2019-10-11 17:56:24 +01:00
Fermi d21f7f9a9b Jacq fix 2019-10-11 15:26:39 +01:00
Fermi 349b5f4369 GRUMBLING INTENSIFIES 2019-10-11 14:36:35 +01:00
Fermi 3ae8581d96 HOPE 2019-10-11 14:34:40 +01:00
r4d6 3e7131c7f6 Update wings.dm 2019-10-11 05:43:55 -04:00
YakumoChen 55e7645773 updating branch 2019-10-11 04:55:57 -04:00
Thalpy e517ece612 Darnit beaker 2019-10-11 08:41:08 +01:00
JTGSZ 988a943f01 Try number 2 2019-10-11 02:36:10 -04:00
Poojawa 2286d40882 why am I making it ignore injections????
The world may never know
2019-10-11 01:34:26 -05:00
r4d6 1b08c541e2 Update wings.dm 2019-10-10 21:11:48 -04:00
r4d6 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
r4d6 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
r4d6 fb715ed955 Update create_mob.dm 2019-10-10 20:32:20 -04:00
r4d6 a61fed2a73 Update preferences.dm 2019-10-10 20:32:19 -04:00
r4d6 ce81e657b5 Update preferences_savefile.dm 2019-10-10 20:32:17 -04:00
r4d6 2d84b541cf Update wings.dm 2019-10-10 20:32:15 -04:00
r4d6 0d5770f986 Update species.dm 2019-10-10 20:32:12 -04:00
r4d6 e83460853c Update furrypeople.dm 2019-10-10 20:32:09 -04:00
Ghommie e734b36ee3 quickfixes lowpop nuclear war tc malus calculation. 2019-10-10 20:54:19 +02:00
Winter Flare 2bce423ec3 Added a -ton- of stuff to the Kinkmate 2019-10-10 14:08:14 -04:00
kevinz000 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
kevinz000 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
kevinz000 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
kevinz000 fda64df569 Merge pull request #9257 from Thalpy/Blind-quirk-without-anger
[READY] Blind quirk without anger
2019-10-10 02:19:17 -07:00
kevinz000 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
kevinz000 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
kevinz000 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
kevinz000 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
kevinz000 c4f8956985 Merge pull request #9433 from Poojawa/hoss-tails
Corrects a missing tail state
2019-10-10 02:10:31 -07:00