Commit Graph

2293 Commits

Author SHA1 Message Date
KorPhaeron
f16b4e1903 Merge remote-tracking branch 'tgstation/master' into toolboxcrusaders 2015-09-22 23:41:02 -05:00
Xhuis
6711406d6a Conflicts 2/3 2015-09-22 16:37:00 -04:00
WhiteFox08
d8bd22a9a5 Fixes runtimes with Dethralling / Deshadowling
Thanks to @CarbonHell for finding this gem.
2015-09-22 14:57:15 -05:00
KorPhaeron
b1b03daf13 Update genetics.dm 2015-09-22 11:50:27 -05:00
Razharas
835da91620 Merge pull request #11883 from phil235/DnaMonkeyStuff
DNA rework
2015-09-22 18:43:27 +03:00
Jordie
32932ae7d5 Merge pull request #11896 from KorPhaeron/forsaeg
Admin Verb: Offer Control
2015-09-22 12:26:23 +10:00
Jordie
01c362f069 Merge pull request #11757 from Xhuis/side_antagonist_tweaks
Side Antagonist Tweaks
2015-09-22 12:26:00 +10:00
KorPhaeron
86d7a15141 If this isn't actually fixed I'm gonna cry 2015-09-21 21:04:28 -05:00
KorPhaeron
039af4067e Parentheses 2015-09-21 19:25:39 -05:00
KorPhaeron
403aac044b compromise 2015-09-21 19:24:28 -05:00
phil235
2fd2f96238 Simplified update_mutations_overlay(), we no longer rebuild the entire mutation layer with all mutations every time we get or lose a mutation. I reintroduced in on_acquiring and on_losing some code similar to the old lose_indication gain_indication procs.
Fixed lesser form changeling, when humanized via dna injector, the ling no longer keeps its Human Form power.

Simplified the racemut trick in humanize() and monkeyize().

Dna now gets qdel'd, just like reagents, when the mob gets qdel'd.

Some tiny fixes here and there.

Added a changelog.
2015-09-22 02:14:37 +02:00
KorPhaeron
ceb87b1d62 key_name_admin 2015-09-21 18:46:28 -05:00
KorPhaeron
4edb09064a span 2015-09-21 17:31:07 -05:00
KorPhaeron
d4bf182366 Indent 2015-09-21 10:07:01 -05:00
KorPhaeron
d2ad29ad98 Removes useless code 2015-09-21 10:01:49 -05:00
KorPhaeron
12bc0caa3a Updates pollCandidates 2015-09-21 09:45:28 -05:00
KorPhaeron
e06ab7e618 12 telecrystals now 2015-09-20 20:27:08 -05:00
KorPhaeron
74c3df9683 Holoparasites 2015-09-20 14:37:41 -05:00
KorPhaeron
947787effd Strange 2015-09-19 23:10:09 -05:00
KorPhaeron
644124923a Offer Control 2015-09-19 23:03:19 -05: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
f53897523c Conflicts 2/3 2015-09-19 14:07:24 -04: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
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
Xhuis
c0d3a67f0e Side antagonist tweaks 2015-09-18 16:54:01 -04:00
Xhuis
2e09024f9d Merge remote-tracking branch 'remotes/upstream/master' into airlock_charge_buff 2015-09-16 22:55:54 -04:00
Xhuis
925817539a Traitor item rebalance 2015-09-16 22:55:45 -04:00
Swag McYolosteinen
3ef5d02cee Merge pull request #11689 from Steelpoint/RifleS
Security Weapon Overhaul: Auto Rifle Edition
2015-09-16 13:34:35 +02:00
Steelpoint
e51eefbe34 MoreChanges 2015-09-16 18:00:21 +08:00
Razharas
73db85100c Merge pull request #11769 from phil235/FixMutations
Some dna fixes
2015-09-15 22:31:59 +03:00
Cheridan
037bce50c2 Merge pull request #11772 from xxalpha/fixthelathe
Fix autolathe rejecting stacks.
2015-09-15 08:01:59 -05:00
Cheridan
0a8690edf0 Merge pull request #11738 from Supermichael777/detomax
Buffs the detomax pda bomb by removing its RANDOM EXPLOSION MECHANIC.
2015-09-14 18:37:53 -05:00
phil235
2333eb6b55 Merge pull request #11763 from RemieRichards/FootprintTweaks
Footprint Tweaks
2015-09-14 20:50:23 +02:00
phil235
c9588662f7 Removed generate_uni_identity from randomize_human() proc since it's already called by ready_dna right after.
Simplifies mutation overlay updating code.
2015-09-14 00:58:25 +02:00
xxalpha
0a055f101a Fix material container 2015-09-13 23:35:49 +01:00
phil235
428a28a440 Fixes monkeyize/humanize removing the mob's viruses when they should be kept.
Fixes NOCLONE and CLUMSY being in both disabilities and mutations. they're now only disabilities.
Fixes minttoxin not gibbing people with the fat disabilities.
Fixes some runtimes, replacing usr by user in some places.
Fixes mutation overlays being removed when updating overlays.
Remove the now unused mob/var/list/mutations and human/var/blood_type
Fixed some formatting in preferences.dm
2015-09-13 22:52:38 +02:00
unknown
68b824e727 increased confusion multiplier, increased confusion sources 2015-09-13 12:39:41 -06:00
Remie Richards
4bb97067b2 Tweaks amount of footprints, and fixes some bugs related to footprints, adds shoetype tracking to footprints 2015-09-13 15:36:56 +01:00
Jordie
e718214a67 Merge pull request #11734 from Menshin/sheets_inserting_safety_checks
Adds boundary checks for stack sheets inserting
2015-09-13 23:13:04 +10:00
Steelpoint
5783cdda03 Merge branch 'master' of https://github.com/tgstation/-tg-station into RifleS
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-09-13 20:00:41 +08:00
Jordie
15e50de0fe Merge pull request #11694 from bear1ake/point-zero
Remove a bunch of useless .0 in vars
2015-09-13 21:47:09 +10:00
Jordie
2ca388bf9f Merge pull request #11696 from Shadowlight213/Edswarmfix
Modifies the Dispense Wizard Justice spell to correct some issues
2015-09-13 21:44:23 +10:00
Supermichael777
fc07017814 it still costs 6 2015-09-12 12:37:45 -04:00
Supermichael777
3be09cfbd2 lowers detomax cost 2015-09-12 12:19:46 -04:00
bear1ake
c52c4a5346 Merge remote-tracking branch 'tgstation/master' into point-zero
Conflicts:
	code/modules/research/protolathe.dm
2015-09-12 21:07:40 +09:00
Steelpoint
ae117c134b Merge branch 'master' of https://github.com/tgstation/-tg-station into RifleS
Conflicts:
	code/game/jobs/job/security.dm
2015-09-12 18:43:15 +08:00
Menshin
ce2ee15b57 * Added boundary checks for stack sheets inserting (fixes #11732)
* Limited material inserting to stack sheets for the protolathe and banana shoes
2015-09-12 12:11:57 +02:00