Commit Graph

1633 Commits

Author SHA1 Message Date
Xhuis
713a0b99ef Buffs melee resistance on the TACTICAL BUCKETS 2015-10-14 21:58:15 -04:00
Xhuis
d07f749145 Conflicts 2/3 2015-10-14 21:56:18 -04:00
Xhuis
14c21cf2a2 Allows you to equip buckets as hats 2015-10-14 21:51:42 -04:00
bgobandit
1e27d5f9da re-adds missing content, thanks obaranges 2015-10-13 21:45:29 -04:00
bgobandit
af819e1878 OH WAIT HONK I'M AN IDIOT 2015-10-13 20:08:08 -04:00
bgobandit
39c40ead33 what the fuck is oxygen 2015-10-13 20:06:44 -04:00
bgobandit
e7555de606 Adds the ability for chemists to turn gibs into soap. Gibs can now be scooped. 2015-10-13 20:01:49 -04:00
Cheridan
b847f6c91f Merge pull request #12323 from phil235/BugFixBoogalooE
Bugfixes, again
2015-10-13 17:08:37 -05:00
Cheridan
afafa9d7ed Merge pull request #12256 from Delimusca/confu2
fixed ethanol confusion
2015-10-11 23:49:28 -05:00
phil235
c19d1c1427 Removed unused code in hologram.dm
Fixes displaycase when you could put a new item in it w/o first removing the first one.
Fixes parrot going through windows when getting on its perch, and some other cases of in_range() instead of Ajacent().
Fixes not being able to change transfer amount of reagent containers while buckled.
Remove unused sprites in stationobjs.dmi
2015-10-11 20:18:13 +02:00
Razharas
08d73f71c9 Merge pull request #12240 from phil235/BugFixBoogalooD
some simple Bugfixes
2015-10-10 03:26:45 +03:00
Razharas
8fd2f74d2b Merge pull request #12223 from phil235/BugFixBoogalooB
Bug fix boogaloo, etc...
2015-10-10 03:24:38 +03:00
Razharas
34f1552eb5 Merge pull request #12199 from Aranclanos/hypomedborg
Fixes medborgs injecting mobs without reagents with their hypospray
2015-10-10 03:17:11 +03:00
unknown
173e044f68 increased ethanol confusion 2015-10-08 19:57:54 -06:00
phil235
c4c447a8dc Fixes hotspot having two New() procs.
Fixes many machines and a few structure not having a cooldown when attacked with an item.
Fixes not being able to eat or be facehugged when wearing riot helmet with visor up.
Fixes not being able to use child of the tool type for craft recipes requiring tools.
Tablecrafting failure message now tells you what caused the failure (missing tool, missing component)
Fixes fuego plasma burrito recipe.
Fixes being able to grab cups from water cooler with telekinesis, putting the cup directly in your hand.
Fixes golem appearing with their old human name for a split second.
Some changes to make code more OOP (take_damage() proc for barricade, shieldgen, etc)
Some tweaks to light tube building code.
2015-10-08 19:50:01 +02:00
phil235
832e650ffc Trashbag can pick up ammo casings and reagent_containers/food/drinks again.
Dipping a lit cigarette into a reagent container heats up the liquid (like every other heat sources) and only unlit cigarette can be dipped to absorb the liquids now.
2015-10-08 01:26:55 +02:00
phil235
0efb30434a Fixes not being able to move during jaunting if you are cuffed and pulled.
Greenglow decal no longer disappears after 2 minutes.
Fixes runtime with explosive implant activation.
Fixes stunbaton infinite cell charge, the baton now turns off if you try using it after its cell has been deleted somehow.
Fixes bloody pulled mob leaving a blood trail in zero G.
Shortens the guardian battlecry message when attacking to lower chat spam.
Items in Morph now disperses a bit on death instead of being all on the same tile.
After reaching a limit of 50 items, morph swallowing items deletes them instead of putting them inside the morph.
Monkeys can no longer modify the hand labeller's text to communicate.
Fixes carbon,radium,uranium 's reaction_turf creating multiple decal on a tile, it now checks if there's already a decal of the relevant type and (for radium and uranium) only transfers reagent to it if it finds one.
2015-10-08 00:48:00 +02:00
Aranclanos
3f0731fab3 Fixes medborgs injecting mobs without reagents with their hypospray 2015-10-06 15:31:01 -03:00
duncathan
4475824890 fixes #12143 2015-10-04 07:33:32 -06:00
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