shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,373 Commits 5 Branches 0 Tags
ff3972247a5589e95240e1b8c26222c7285db0a4
Commit Graph

15310 Commits

Author SHA1 Message Date
Ghommie ff3972247a Fixes some missing species_traits for cloth, clockwork and cult golems. 2019-10-13 23:40:52 +02:00
kevinz000 4c52b7a416 Merge pull request #9339 from Ghommie/Ghommie-cit205 
Removes revenant blight's shabby tox damage in favor of negative mood effects, and necropolis curse if not cured
 2019-10-13 14:00:52 -07:00
kevinz000 48e4187cef Merge pull request #9461 from r4d6/master 
Adding Decorative Wings
 2019-10-13 14:00:07 -07:00
kevinz000 1fda4deef7 Merge pull request #9465 from Trilbyspaceclone/patch-230 
Update granters.dm
 2019-10-13 13:58:03 -07:00
kevinz000 53858e1818 Merge pull request #9416 from Ghommie/Ghommie-cit215 
The niche singularity beacon now also moderately buffs meteor waves.
 2019-10-13 13:56:03 -07:00
kevinz000 3d9f012cdb Merge pull request #9464 from JTGSZ/speciesrestrictions2 
Re-adds latejoin menu qualifies for rank proc restrictions. Try number 2
 2019-10-13 13:55:21 -07:00
kevinz000 064e6980f9 Merge pull request #9474 from Putnam3145/fix-nanites 
Makes neural nanite programs not drain nanites on things they can't fix
 2019-10-13 13:55:05 -07:00
kevinz000 adeb33cdae Merge pull request #9463 from Owai-Seek/minor-fixes 
Updating Kinkmate item-list
 2019-10-13 13:54:26 -07:00
kevinz000 32b2d629e4 Merge pull request #9473 from PersianXerxes/stopCultSpareTPing 
Set clockcult teleport in Captain's Quarters to false.
 2019-10-13 13:46:40 -07:00
Ghommie c78078bdd4 typo 2019-10-13 06:08:53 +02:00
Ghommie 7b65343f45 z-level checks. 2019-10-13 06:04:57 +02:00
deathride58 0c8b82168d Merge branch 'master' into Ghommie-cit222 2019-10-12 11:20:32 -04:00
Putnam 7003080440 Merge branch 'master' into fix-nanites 2019-10-12 02:36:51 -07:00
Persi db1f459151 Set clockcult teleport in Captain's Quarters to false. 2019-10-12 03:01:52 -04:00
Putnam c389099a47 Makes brain-healing nanites not work uselessly 2019-10-11 23:58:34 -07: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
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
Sishen c51bfc153b b 2019-10-11 13:24:00 -04: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 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