Commit Graph

9869 Commits

Author SHA1 Message Date
Thalpy
82446681bf Everything is pain 2019-10-12 13:22:05 +01:00
Thalpy
d94f796ffb aaaa 2019-10-12 12:42:51 +01:00
Putnam
7003080440 Merge branch 'master' into fix-nanites 2019-10-12 02:36:51 -07:00
Fermi
ecfc988911 Okay! 2019-10-12 09:15:32 +01:00
Fermi
2a6b84151e Removed something I didn't mean to 2019-10-12 07:59:44 +01:00
Putnam
c389099a47 Makes brain-healing nanites not work uselessly 2019-10-11 23:58:34 -07:00
Fermi
2e03985696 aaaa 2019-10-12 07:55:19 +01:00
Fermi
f922a3dda5 Fast!! 2019-10-12 07:18:39 +01:00
kevinz000
076b2d48fc Update secbot.dm 2019-10-11 20:46:19 -07:00
kevinz000
8c07a79700 Update bot.dm 2019-10-11 20:45:42 -07:00
kevinz000
5cf627e889 Update computer.dm 2019-10-11 20:43:36 -07:00
kevinz000
f393c7fff2 Update new_player.dm 2019-10-11 20:43:10 -07:00
kevinz000
e600b59217 Update computer.dm 2019-10-11 20:42:01 -07:00
Fermi
7bce68bb11 Merge branch 'master' into Spookytime 2019-10-11 21:51:48 +01:00
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
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
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
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