Commit Graph

12467 Commits

Author SHA1 Message Date
c0 8d54f835ae Materials - final solution 2015-09-22 00:18:37 +03:00
Razharas 836c31ac83 Merge pull request #11845 from xxalpha/nanites
Added a self-repair module for cyborgs.
2015-09-21 22:06:45 +03:00
Razharas 5f8318de85 Merge pull request #11875 from Aranclanos/adminfollow
Removes a sleep in the admin follow command.
2015-09-21 21:59:38 +03:00
KorPhaeron 9c221f47af Nerf teleport attack 2015-09-21 09:07:16 -05:00
KorPhaeron 903c041279 Slightly less damage for the punchghost 2015-09-21 03:23:23 -05:00
KorPhaeron 451caf6bd5 Holoparasites is a dumb name 2015-09-21 03:15:03 -05:00
KorPhaeron 550697318d Chaos Fixes 2015-09-21 03:11:05 -05:00
Jordie0608 1d9c61702d Merge branch 'master' of https://github.com/tgstation/-tg-station into bagsofholdingsarejustincompletesingularitygrenades
Conflicts:
	code/modules/projectiles/guns/energy/nuclear.dm
2015-09-21 17:00:08 +10:00
Jordie0608 d26be7dc4d removes debug 2015-09-21 16:40:28 +10:00
Jordie0608 895c52b649 in game interface for creating server polls 2015-09-21 16:37:21 +10:00
Aranclanos 6e117f031e Merge pull request #11837 from Steelpoint/GunSprites
Auto Rifle Sprites and Bug Fixes
2015-09-21 03:23:22 -03:00
Steelpoint 422f7ecfe5 Fix 2015-09-21 10:25:27 +08:00
Steelpoint 2f9a37d624 Changes 2015-09-21 10:21:10 +08:00
KorPhaeron 2c2af6c634 Limit 2015-09-20 21:00:17 -05:00
KorPhaeron 74c3df9683 Holoparasites 2015-09-20 14:37:41 -05:00
Xhuis 4a34f42a0a Give Syndiborgs more stuff 2015-09-20 14:38:25 -04:00
Swag McYolosteinen 1a5df1d08b Merge pull request #11846 from GunHog/RadsPlzKThxLol
Advanced Energy Gun fixes
2015-09-20 20:36:17 +02:00
Remie Richards 225eee3d2f Merge pull request #11815 from spasticVerbalizer/shootFooting
Makes clumsy misfires actually target a leg
2015-09-20 17:24:24 +01:00
Xhuis 979ae3ade6 Cleans up heart eating code 2015-09-20 12:01:50 -04:00
kingofkosmos 65c516607f Adds altclick rotation + description to doppler array, transit tubes, windoor assembly, infrared emitter, emitter, particle accelerator, disposal tubes. 2015-09-20 18:54:23 +03:00
Swag McYolosteinen 9cfdb75295 Merge pull request #11852 from Xhuis/cult_update_update
Cult Refactor Update
2015-09-20 17:53:35 +02:00
Maarten van den Berg f3f080693a Adds zone_override var to process_fire and friends, updates clumsy and gun suicide 2015-09-20 16:52:39 +02:00
Xhuis a4d99a528d Adds a missing parentheses 2015-09-19 23:25:52 -04:00
Xhuis 9658f87ecc Changelings nerfs, tweaks, and additions 2015-09-19 23:12:47 -04:00
Xhuis 4a1c7c0481 Two small changes 2015-09-19 23:10:51 -04:00
Aranclanos 46abb3f9ff Fixes the alien infestation event not triggering if a vent is in the qdel queue 2015-09-19 23:39:35 -03:00
KorPhaeron 20b8487120 Typo 2015-09-19 21:39:23 -05:00
KorPhaeron 587d485c4c Guardian Changes 2015-09-19 20:27:26 -05:00
Xhuis 38c277f42e Adds swarmer spawn event and changes demon hearts 2015-09-19 18:38:01 -04:00
phil235 069e5cdbe5 Fixes the errors from merge conflicts
Fixes changeling readaptation not removing chameleon skin, arm blade, organic suits and shield.
2015-09-19 23:41:39 +02:00
phil235 6ee5ab6680 Merge branch 'master' of https://github.com/tgstation/-tg-station into DnaMonkeyStuff
Conflicts:
	code/__HELPERS/unsorted.dm
	code/modules/admin/verbs/one_click_antag.dm
2015-09-19 22:34:30 +02:00
phil235 f90ee4aa8c - Fixed monkey starting with no dna.
- Fixed bugs with monkeyize/humanize: 7803 (humanized monkey nobloodtype)
- Fixes 9298 monkeyed ling have troubles humanizing themself (already fixed?)
- Fixes despawning clothes when monkeyizing. 11855
- Replaced check_dna_integrity proc by simpler has_dna proc when required.
- created set_species() proc
- fixed space retrovirus not transfering SE (despite having a domutcheck()). Still need to check if it needs a name = real_name.
- I renamed mecha/var/dna to dna_lock to avoid confusion
- I renamed an armor var in a species proc to armor_block to avoid confusion with species/var/armor.
- I removed many if(dna) checks in lots of files.
- I removed duplicate defense procs between human/proc/X and dna.species/proc/X since dna is now always set.
- Anatomic panacea from changeling removes alien embryo correctly. 6247
- Fixes runtime when trying to put dna-less brain mmi into a dnalocked mech.
- Removed carbon/var/list/features, we now only have dna.features and prefs.features
- Remove hulk mutation from lizards and other species (Fixed 6413); only real humans can acquire hulk. (less work on sprites for each ones, fixes lizard tail not in hulk color)
- Fixes cloning not setting up correctly dna UE and dna.real_name
- I fixed the issue with sucked+cloned ling being unable to absorb
- I fixed issue with changeling proc checking if they have the dna already not working.
- Fixed 4095, low health hulk with DAA getting stuck in loop of acquiring/losing hulk.
- I added a second layer for mutations to differientate mutations that go below and above the body layer (Fixes 7858)
- Fixes 10048, the transform to initial appearence button was fucking up the dna.

- Fixes cloning not setting up correctly dna UE and dna.real_name
- Fixed the issue with sucked+cloned ling being unable to absorb
- Fixed issue with changeling proc checking if they have the dna already not working.
- Fixed 4095, low health hulk with DAA getting stuck in loop of acquiring/losing hulk.
- Added a second layer for mutations to differientate mutations that go below and above the body layer (Fixes 7858)
- Fixes 10048, the transform to initial appearence button was fucking up the dna.
2015-09-19 22:18:28 +02:00
Xhuis 76b90ef25c Adds a variable, can_unsuppress 2015-09-19 14:25:16 -04:00
Xhuis f53897523c Conflicts 2/3 2015-09-19 14:07:24 -04:00
Xhuis d32d3287d1 Adds revenant tweaks 2015-09-19 14:03:04 -04:00
kingofkosmos dbfdf120ec AI and borgs only do damage-sparking if alive. 2015-09-19 19:19:37 +03:00
kingofkosmos 8d77e8e517 Makes spark_system a permanent var for AI 2015-09-19 18:58:47 +03:00
phil235 bfa06222ea Merge pull request #11830 from Aranclanos/updatetriggerthis
Removes update_triggers.dm
2015-09-19 16:47:19 +02:00
Aranclanos ce672c2960 Adds a qdel check for when the beaker spills their reagents on the turf where the beaker itself is present. 2015-09-19 11:21:06 -03:00
Aranclanos 25f998393a Removes a sleep in the admin follow command. 2015-09-19 10:41:59 -03:00
Remie Richards 82a79a1705 Merge pull request #11787 from bgobandit/theywanttherandd
Adds origin tech values to a lot of items.
2015-09-19 14:20:09 +01:00
Remie Richards c10f8cd6d1 Merge pull request #11838 from xxalpha/whythough
Fixed protolathe not printing things that required reagents.
2015-09-19 14:15:42 +01:00
Remie Richards 6cd3d98017 Merge pull request #11843 from Tokiko1/fertilizerbuff
Huge Left4Zed buff
2015-09-19 14:13:16 +01:00
Remie Richards 3d6b98d3cf Merge pull request #11836 from optimumtact/neopocalypse
Remove comment and bandaid fix
2015-09-19 14:11:11 +01:00
Remie Richards 9363a14d2f Merge pull request #11743 from Delimusca/cleanconfusion
changes confusion to be less RNG garbage
2015-09-19 14:01:58 +01:00
bgobandit db2f4d4a6a Adds kitty mousey toys! :3 2015-09-18 22:51:41 -04:00
phil235 966ff4b05a Merge pull request #11853 from feemjmeem/11850-fix
partial revert of #11699, fixes #11850 without breaking #11699
2015-09-19 03:18:11 +02:00
Xhuis 9e1f857afc Doubles boost time for slaughter demons 2015-09-18 18:36:25 -04:00
Xhuis 01005f6b82 Prevents blood crawling with held items 2015-09-18 18:30:44 -04:00
Xhuis 67ca94c5fa Merge remote-tracking branch 'remotes/upstream/master' into slaughter_demon_stuff 2015-09-18 16:54:13 -04:00