Commit Graph

3660 Commits

Author SHA1 Message Date
c0
feeb9ff7d2 Organs update 3 2015-09-25 22:26:15 +03:00
Razharas
14d54d3ef2 Merge branch 'duncathan-hemanifolds' 2015-09-25 16:45:57 +03:00
Razharas
9d8cf0ffe9 Merge branch 'hemanifolds' of https://github.com/duncathan/-tg-station into duncathan-hemanifolds 2015-09-25 16:35:08 +03:00
Razharas
b9b8734b74 Merge pull request #11966 from MMMiracles/dwarfsman
Dwarfism
2015-09-25 12:18:52 +03:00
Cheridan
e1b16b057c Merge pull request #11964 from Delimusca/durrymunchin
ease-of-use smoking improvements
2015-09-24 22:26:22 -05:00
Razharas
7c757a735f Merge pull request #11968 from xxalpha/hot_or_not
Removed /proc/is_hot() && Removed /proc/is_sharp()
2015-09-25 04:02:52 +03:00
Razharas
3c4994749b Merge branch 'TacticalEspionageAction' of https://github.com/Incoming5643/-tg-station into Incoming5643-TacticalEspionageAction 2015-09-24 23:52:38 +03:00
phil235
fd0b52f06c Merge pull request #11920 from Jalleo/ImplantCleanup
Cleanup of base implant file and tiny change of my last merged PR
2015-09-24 14:43:21 +02:00
xxalpha
f493bff99c Fixed merge. 2015-09-24 03:26:52 +01:00
xxalpha
22474094ae Merge remote-tracking branch 'upstream/master' into hot_or_not
Conflicts:
	code/modules/mob/living/simple_animal/simple_animal.dm
2015-09-24 03:14:04 +01:00
xxalpha
3d15d791fb Merge branch 'edgy' into hot_or_not
Conflicts:
	code/__HELPERS/unsorted.dm
2015-09-24 03:12:08 +01:00
xxalpha
deb60ae309 Replaced /proc/is_sharp() with /obj/item/proc/is_sharp(). 2015-09-24 03:08:28 +01:00
xxalpha
655b1a77c7 Replaced refactored is_hot() to be an atom proc. 2015-09-24 01:12:38 +01:00
Razharas
5041f46bba Merge pull request #11910 from Lijah99/RPD_true_suicide
Adds a suicide message for the RPD
2015-09-24 02:07:25 +03:00
Razharas
aa87f0a785 Merge pull request #11749 from feemjmeem/suicides-sep12
updated suicide_acts for newspaper, spraycan, and soap
2015-09-24 01:33:27 +03:00
MMMiracles
3d43b8e389 dwarfdwarfdwarf 2015-09-23 18:13:16 -04:00
unknown
5a798a7210 cig lighting user feedback 2015-09-23 15:25:35 -06:00
unknown
e971423dc6 removed targetzone checks from smoking stuff 2015-09-23 15:16:11 -06:00
Razharas
e9bed91a1e Merge pull request #11925 from Core0verload/matter-final
Materials - final solution
2015-09-23 21:11:17 +03:00
Xhuis
6711406d6a Conflicts 2/3 2015-09-22 16:37:00 -04:00
Razharas
835da91620 Merge pull request #11883 from phil235/DnaMonkeyStuff
DNA rework
2015-09-22 18:43:27 +03:00
Xhuis
66f67946ae Merge remote-tracking branch 'remotes/upstream/master' into airlock_charge_buff 2015-09-21 22:18:24 -04: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
c0
8d54f835ae Materials - final solution 2015-09-22 00:18:37 +03:00
Razharas
38234c97ee Merge pull request #11798 from AnturK/displaycase
Buildable Display Cases
2015-09-21 22:09:10 +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
blah
ddf2ef1f9c Cleans up the implant.dm by splitting it up into multiple files with only generic implant files being in implant.dm now.
Also changes tracking_implants list to tracked_implants to make it more clearer
2015-09-21 17:56:58 +01:00
Swag McYolosteinen
33b0919e7d Merge pull request #11816 from Jalleo/ImplantTrackingFix
Improves implant tracking by using a list instead of world
2015-09-21 18:10:38 +02:00
blah
f26f6145ac Add even more tracking fixes to improve performance 2015-09-21 17:06:11 +01:00
Lijah99
884efcb308 adds a suicide message for the rpd 2015-09-20 20:30:28 -06: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
xxalpha
204c21d287 Added a self-repair module for cyborgs.
empty line

Changelog

Changed the module to heal more when cyborg is in critical.
2015-09-19 18:38:24 +01: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
Xhuis
af31d566b2 Syndicate medical cyborgs 2015-09-17 20:02:48 -04:00
AnturK
8067597beb Display case chasssis 2015-09-17 17:53:26 +02:00
AnturK
ac813a0ced Display cases 2015-09-17 17:53:24 +02:00
xxalpha
b119b0e113 Added a self-repair module for cyborgs. 2015-09-17 15:56:39 +01:00
Cheridan
76d1e6add5 Merge pull request #11556 from bgobandit/hardmeatspike
MEAT SPIKE EXPANSION
2015-09-16 20:19:42 -05:00
xxalpha
4d4b8e64c1 Merge remote-tracking branch 'upstream/master' into n_u_c_l_e_a_r
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-09-16 23:14:14 +01:00
phil235
3ca12736ca Merge pull request #11700 from feemjmeem/suicides-sep10
suicide messages for damp rag, tanks, and telebaton
2015-09-16 23:57:51 +02:00
blah
e976aa20b4 God dammit timing is perfect for no one 2015-09-16 12:55:36 +01:00
blah
1fc4f2c5b2 Welp 2015-09-16 12:51:55 +01:00
blah
ccbbf623bb Makes it better 2015-09-16 12:42:27 +01:00
blah
d14c65d12b Improves implant tracking by having it search through a list instead of the world 2015-09-16 10:22:52 +01:00
bgobandit
0664cffa45 tweaks shit 2015-09-15 21:43:19 -04:00
Xhuis
1178fbe079 Major cult changes
The current code for runes is god-awful. Like, seriously terrible. This PR aims to fix that. Rather than having every rune effect defined in a single attack_hand proc, this PR will separate the runes into subtypes, which supports for more modular runes as well as cleans up the code.

It also separates invocation into a two different procs. The first of these will determine if the rune can be invoked; if that passes, the second will cause the rune's effects. There is also a third proc that will cause effects if the rune fails to invoke.

Research words have been removed, and all runes are now available from the start of the round. This is highly subject to change once some feedback is in from actual cult rounds.

Miscellaneous tweaks:

    Blood boil runes now explode when used
    Convert runes can now work solo, but take time
    Armor runes now only provide the basic armor set
    Tomes now do a static 15 burn damage and play a sound
    If the Escape objective is rolled, the amount of people that must escape will scale with the round population to a factor of 5 (i.e. 50 players = 10 cultists)
2015-09-16 10:04:49 +12:00
Razharas
73db85100c Merge pull request #11769 from phil235/FixMutations
Some dna fixes
2015-09-15 22:31:59 +03:00
Marc R. Uchniat
4ee9e11860 telebaton and tank suicides now check for deletion properly, telebaton properly deletes brain, tank no longer drops brain 2015-09-15 10:02:46 -07:00