Commit Graph

15408 Commits

Author SHA1 Message Date
Ghommie
c78078bdd4 typo 2019-10-13 06:08:53 +02:00
Ghommie
7b65343f45 z-level checks. 2019-10-13 06:04:57 +02:00
Putnam
1b97c50ef7 Makes pod people not constantly slightly fat 2019-10-12 17:50:51 -07:00
Thalpy
3b8ea30d9b I did it 2019-10-12 20:06:46 +01:00
Thalpy
f6796b93b3 Fixes graft 2019-10-12 18:22:48 +01:00
Thalpy
04b40fd557 Tongues decay slower. 2019-10-12 18:01:02 +01:00
Thalpy
96d5a0f74c Heart decay 2019-10-12 18:00:34 +01:00
Thalpy
7ad16947a7 Cleanups 2019-10-12 18:00:16 +01:00
deathride58
0c8b82168d Merge branch 'master' into Ghommie-cit222 2019-10-12 11:20:32 -04:00
Thalpy
cbc20d33d5 Phew 2019-10-12 15:13:18 +01:00
Thalpy
3f16c287a9 I'm big silly 2019-10-12 13:40:40 +01:00
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
Persi
db1f459151 Set clockcult teleport in Captain's Quarters to false. 2019-10-12 03:01:52 -04: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
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
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