Commit Graph

1364 Commits

Author SHA1 Message Date
Razharas
0c925f2de5 Merge pull request #12116 from Xhuis/borg_why_did_you_let_me_die
Fixes Syndicate cyborg hyposprays not injecting properly
2015-10-04 07:22:58 +03:00
Razharas
bac5ccd2c7 Merge pull request #12080 from Xhuis/doctors_delight_buff
Doctor's Delight changes
2015-10-04 05:09:42 +03:00
Xhuis
40918f93c5 Fixes a small issue with Syndicate mediborgs 2015-10-02 15:53:21 -04:00
Razharas
3bf8ae1f1a Merge pull request #12057 from Xhuis/it_worked_in_testing_3
Fixes and tweaks to Syndicate medical cyborgs
2015-09-30 23:14:58 +03:00
Razharas
1aa0e911ae Merge pull request #11760 from Core0verload/selfrepair
Cyborgs update
2015-09-30 22:50:08 +03:00
Xhuis
292aeb2367 Oopsie 2015-09-30 13:23:29 -04:00
Xhuis
2d98626ce3 Nerfs the buff 2015-09-30 13:23:06 -04:00
Xhuis
4e33e464a4 Implements hunger drain + changelog 2015-09-29 23:12:45 -04:00
Xhuis
840ab165f3 Buffs the Doctor's Delight to its old effects 2015-09-29 22:31:12 -04:00
Xhuis
129b7b9b2f Fixes & tweaks 2015-09-27 23:27:18 -04:00
c0
feeb9ff7d2 Organs update 3 2015-09-25 22:26:15 +03:00
c0
a687b07eac f u c k c o n f l i c t s 2015-09-25 14:35:44 +03: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
655b1a77c7 Replaced refactored is_hot() to be an atom proc. 2015-09-24 01:12:38 +01:00
Razharas
b2e42f518d Merge pull request #11876 from Aranclanos/beaker
Adds a qdel check for when the beaker spills their reagents on the tu…
2015-09-24 01:43:03 +03:00
Xhuis
6711406d6a Conflicts 2/3 2015-09-22 16:37:00 -04:00
Xhuis
4a34f42a0a Give Syndiborgs more stuff 2015-09-20 14:38:25 -04: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
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
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
Xhuis
af31d566b2 Syndicate medical cyborgs 2015-09-17 20:02:48 -04:00
oranges
bb668d7ddf Remove comment and bandaid fix 2015-09-17 15:12:00 +12:00
Razharas
73db85100c Merge pull request #11769 from phil235/FixMutations
Some dna fixes
2015-09-15 22:31:59 +03:00
Cheridan
f8d8e5e070 Merge pull request #11756 from Iamgoofball/patch-122
Fixes #11752, resets CLF3's metab. rate to 4u instead of 0.5u
2015-09-14 18:31:39 -05: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
Swag McYolosteinen
30b140ae8a Merge pull request #11603 from Fox-McCloud/stimulantsfix
Fixes Stimulants Speedbuff
2015-09-13 17:32:19 +02:00
Swag McYolosteinen
ac41b600ce Merge pull request #11718 from phil235/TableClimbingFixes
Tableclimbing & reagent runtime fixes
2015-09-13 17:26:33 +02:00
Jordie
77911b67ba Merge pull request #11709 from bgobandit/fuckyouslimesfuckfuckfuck
Fixes pink slime potions.
2015-09-13 21:59:08 +10:00
Iamgoofball
265dadea68 Fixes #11752, resets CLF3's metab. rate to 4u instead of 0.5u
@phil235 you forgot to keep it at 4u, which is why CLF3 does so much damage over time

it's supposed to do a lot of damage but metabolize really really fast

you accidentally made it do a lot of damage but metabolize really slowly
2015-09-12 21:31:00 -07: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
phil235
1db6687314 little tweak 2015-09-11 18:19:10 +02:00
phil235
c069ea0a7d Fixes runtime in monkey/attack_hand()
Fixes tableclimbing: no more success message when failing; you can no longer pass through barricade when tableclimbing.
Fixes runtime with krokodil addiction
Xenomorph can no longer get addicted or overdose on reagents.
2015-09-11 18:08:54 +02:00
bgobandit
5ca28e3e5c Fixes pink slime potions. 2015-09-10 22:38:15 -04:00
phil235
e74ca82a47 Merge branch 'master' of https://github.com/tgstation/-tg-station into ReagentReactionRuntimeFix
Conflicts:
	code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm
	icons/obj/assemblies/new_assemblies.dmi
2015-09-10 21:49:39 +02:00
Razharas
17e5d0eea5 Merge pull request #11525 from xxalpha/dryshoes
Absorbent galoshes.
2015-09-10 22:01:03 +03:00
bear1ake
f697ae90f5 removes a bunch of .0 2015-09-10 20:57:30 +09:00
Aranclanos
fbbdbe17ed Merge pull request #11666 from tgstation/Fixing_bugs_from_browser_with_edit_button
Fixes blood mixing not merging symptoms properly
2015-09-09 12:48:52 -03:00
Razharas
c40dea1ebd Removes src and renames the argument
Removes src and renames the argument
2015-09-09 16:36:40 +03:00
Razharas
524186e4db Merge pull request #11569 from Anonus/blobchemtweaks
Changes blob chemicals
2015-09-09 02:44:34 +03:00
Razharas
54a58ddbf5 Fixes blood mixing not merging symptoms properly
Fixes blood mixing not merging symptoms properly
Fix  #11482
2015-09-09 01:46:04 +03:00
xxalpha
a62c09bbb7 Merge remote-tracking branch 'upstream/master' into dryshoes
Conflicts:
	code/__DEFINES/misc.dm
2015-09-08 16:56:37 +01:00
oranges
966ec11958 Adds game and attack logging to rags
This adds a proc to help print reagent lists nicely
2015-09-08 12:39:48 +12:00
Fox-McCloud
cbe9ec7fae Fixes Stimulants Speedbuff 2015-09-06 00:09:30 -04:00
octareenroon91
1327441478 Correct 'You inject' text
Injections will now correctly report the amount of reagent you inject. Lethal injection syringes specifically will report correctly.
2015-09-05 16:47:21 -06:00
Nerd Lord
4db08a755a Actually I think I prefer the old one, it's less red. 2015-09-03 17:28:04 -04:00
Nerd Lord
bfa73cad7d ah yes, chemistry code 2015-09-03 15:39:38 -04:00