Commit Graph

352 Commits

Author SHA1 Message Date
Razharas 02fe4ec5a8 Merge pull request #13443 from MrStonedOne/DONTWAIT-IKNOWWHATYOURTHINKING-YOUDONTNEEDMYRETURN-DONTWAITCAUSEISLEEP
changes `spawn() throw_at` to `throw_at_fast set waitfor = 0`
2015-12-06 19:52:06 +03:00
MrStonedOne 9fa4288b08 Makes everything that used spawn () throw_at use throw_at_fast 2015-12-05 16:40:52 -08:00
Razharas 41341461b0 Merge pull request #13393 from kingofkosmos/fewinhandsprites
In-hand sprites: transfer tank valve, tracking beacon, pizza box & carp plushie
2015-12-05 01:14:20 +03:00
Cheridan f634890457 Merge pull request #13335 from Incoming5643/fudge_dice
Fudge dice
2015-12-02 16:40:25 -06:00
kingofkosmos ee522d61d7 Merge branch 'master' of https://github.com/tgstation/-tg-station into fewinhandsprites 2015-12-02 06:05:40 +02:00
swankcookie 3e5e9086c0 fix 2015-12-01 21:52:35 -06:00
Incoming 0c1d7272d5 Adds fudge dice
They're six sided dice with two pluses, two minusii, and two blank sides.

They're also a jokey recipe you can create with any dice and a chocolate bar. Once you eat the literal fudge die you get a fudge die no matter what kind of die you used into its creation. This is INTENTIONAL AND PART OF THE JOKE.

Adds them to the "rare dice" spawn in dice bags.

Formally defines a d6 as a separate thing from the generic parent die. the generic parent die is still a d6 for all intents and purposes except for the fact that it's now just called a generic "die" instead of a d6. This was so the recipe didn't list a d6 as needed for the fudge dice recipe when really any die would do.

Doesn't replace existent generic die with d6eses on the maps because I don't want this to conflict for a million years. I'll swap out the generic dies at some future point after this is added.
2015-11-30 15:19:25 -05:00
kingofkosmos edb611f53d Adds in-hand sprites for tracking beacon, pizza box and carp plushie. 2015-11-29 16:43:52 +02:00
Jordie da0c466f82 Merge pull request #13149 from Firecage/toolspeed
Adds toolspeed
2015-11-29 21:06:15 +11:00
Firecage c933363062 Adds the toolspeed var and adds it to most usages of tools which has a timer 2015-11-21 19:24:14 +02:00
Incoming 1f9f0dfc40 Adds subtypesof(). It's shorthand for typesof(path) - path.
Replaces typesof(path) - path with subtypesof(path) in obvious places. I was a bit conservative, there's probably a few more places that could use this.
2015-11-16 18:55:57 -05:00
phil235 5e43d2b570 Merge pull request #12924 from Firecage/Optable
Changes the operating table to be an actual table.
2015-11-11 17:31:38 +01:00
Firecage 9ce5334890 merge conflict fix 2015-11-10 18:44:10 +02:00
MrStonedOne 88eef20b69 Fixes smartfridges once and for all. 2015-11-09 14:35:16 -08:00
phil235 6c99bf6e71 Remove some debug message in smartfridge code. 2015-11-08 21:40:41 +01:00
Firecage b2937bf315 Changes the operating table to be an actual table. 2015-11-08 22:09:35 +02:00
blah ea4bdc9ad7 Fixes the smartfridge.dm properly 2015-11-06 20:24:40 +00:00
blah e9e0f452dd Fixes the smartfridge.dm 2015-11-04 17:45:29 +00:00
blah e563c0b47e Quick merge before complete do not send this to main repo yet 2015-11-04 16:41:17 +00:00
KorPhaeron 53cdf169e1 Xenobio control 2015-10-30 03:53:18 -05:00
Razharas ba1b70106d Merge pull request #12497 from bgobandit/ayyyfixes
Even more xenobiology fixes and tweaks
2015-10-27 18:28:48 +03:00
Cheridan 89680225c0 Merge pull request #12590 from phil235/TransferAmountFix
Fixes changing transfer amounts not working for shaker
2015-10-23 13:33:13 -05:00
phil235 564857d3c9 Fixes changing transfer amounts not working for shaker, drinking glass and condiment bottle. And remove it from damp rag and shot glass, since they only have one possible tranfer amount. Fixes the shaker's name being capitalized for no reason (and without an \improper ). 2015-10-22 18:40:32 +02:00
phil235 d3ee910211 Makes effect system code more OOP.
obj/effect/effect is now renamed obj/effect/particle_effect for better usability.
datum/effect/system and /datum/effect/effect/system are now both /datum/effect_system.
Fixes a bug where wall mounted igniters (and other spark producing objects) didn't produce sparks sometimes.
Moved explosion_particles.dm into the effect_system folder, because it has effect_systems code.
2015-10-21 23:28:29 +02:00
Razharas 33e6d35d03 Merge pull request #12378 from bgobandit/fuckeverything
Chemists can turn gibs into soap, candles, and meat product: no fucking .int edition
2015-10-19 19:54:42 +03:00
Razharas 123390d640 Merge pull request #12459 from phil235/BugFixBoogalooG
Phil's batch of fixes
2015-10-19 10:03:28 +03:00
bgobandit a1baaabd53 xenobio qol changes/balance stuff 2015-10-19 00:03:39 -04:00
bgobandit 08fefe27b5 addresses phil's concerns 2015-10-17 20:46:40 -04:00
Razharas f87d72571e Merge pull request #12420 from phil235/TransferAmountChange
Set Transfer Amount for reagent containers now uses attack_self() instead of object verb
2015-10-17 18:06:39 +03:00
phil235 a7bc8475d8 Fixes winter coat hood sprite appearing as a bucket.
Removing Smile, Swedish, Chav and Elvis from genetics. These mutation can still be acquired via adminspawned dna injector. Added a dna injector for laser eyes mutation.
Fixes using razor on non human shaving non existent hair.
Fixes chair deconstruction dropping too much metal.
Adding some necessary check for mob buckling in gibber, processor and monkey recycler code, and in ventcrawling proc to fix being able to enter pipe while feeding as a slime.
Fixes snapcorn not giving seeds.
Fixes portable chem dispenser.
2015-10-17 16:29:11 +02:00
phil235 dce2027d01 Changing the transfer amount of all reagent containers (beaker, bucket, glass) is now done by clicking them, similar to spray. Reagent dispensers (watertank, fueltank, pepperspray dispenser) no longer have their own transfer amounts and use the reagent container's transfer amount instead (except for sprays which get 50u for faster refilling).
Removed object verb "Set Amount per transfer from this" for both reagent containers and reagent dispensers.
2015-10-16 01:07:10 +02:00
bgobandit fbdbe43118 adds grappa and grape tarts, fixes typos O NO 2015-10-15 13:25:59 -04:00
bgobandit 2bb40e9e86 Adds recipes for grapes and grape juice. 2015-10-15 00:33:59 -04:00
bgobandit 1e27d5f9da re-adds missing content, thanks obaranges 2015-10-13 21:45:29 -04:00
Razharas 08d73f71c9 Merge pull request #12240 from phil235/BugFixBoogalooD
some simple Bugfixes
2015-10-10 03:26:45 +03: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
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
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
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
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 47fb102125 Merge pull request #11633 from bgobandit/cocosprite
Coffee and tea mugs now appear empty when empty.
2015-09-13 21:44:42 +10: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
bear1ake f697ae90f5 removes a bunch of .0 2015-09-10 20:57:30 +09:00
bgobandit b3b9941432 Merge branch 'master' of https://github.com/tgstation/-tg-station into matsblastusa
Conflicts:
	code/modules/assembly/flash.dm
2015-09-09 14:04:41 -04:00
bgobandit ed26da8366 Coffee and tea mugs now appear empty when empty. 2015-09-07 10:53:05 -04:00
duncathan 51c09f16bf makes all Destroy()'s return properly 2015-08-31 00:21:01 -06:00