Commit Graph

17225 Commits

Author SHA1 Message Date
Fermi
6e7c433536 Song fix 2019-10-11 21:34:30 +01:00
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
b56563fcfe Merge pull request #9374 from kappa-sama/walktime
ashwalkers now have more messages telling them to not go on station
2019-10-11 12:13:49 -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
bcc92d234b Merge pull request #9386 from Sishen1542/suitrad
Gives suit storage units the ability to remove radiation from mobs
2019-10-11 12:13:04 -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
9120e4b7c8 Merge pull request #9399 from Arturlang/patch-1
[s] Adds a distance check to the supermatter tongs consume action, ported from TG
2019-10-11 12:10:53 -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
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
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
Trilbyspaceclone
7495de7d15 Update granters.dm 2019-10-11 14:04:08 -04: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
8b1e140fa0 Update code/__HELPERS/mobs.dm
Co-Authored-By: Poojawa <Poojawa@users.noreply.github.com>
2019-10-10 21:09:14 -04:00
r4d6
618f8f30c5 Update code/__HELPERS/global_lists.dm
Co-Authored-By: Poojawa <Poojawa@users.noreply.github.com>
2019-10-10 21:09:09 -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
2822f43720 Update global_lists.dm 2019-10-10 20:32:25 -04:00
r4d6
05fa19c856 Update mobs.dm 2019-10-10 20:32:24 -04:00
r4d6
fef7dd4ac5 Update flavor_misc.dm 2019-10-10 20:32:22 -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