Commit Graph

131 Commits

Author SHA1 Message Date
Cheridan 2a6a63253b Merge pull request #13608 from KorPhaeron/fire_defines
Makes burn_state use defines
2015-12-14 10:44:10 -06:00
KorPhaeron d8a37204e7 Makes burn_state use defines 2015-12-13 05:36:55 -06:00
Incoming 61e5dafb42 An oversight meant that while planted glowcaps worked fine, they'd never be created. 2015-12-13 01:33:21 -05:00
Incoming5643 40cac0aec3 Racism against division must end 2015-12-08 13:53:18 -05:00
Incoming 7f3a1158d2 Adds glowcaps
Glowcaps are red mutant glowshrooms. They can be used in all the same ways normal glowshrooms can, but they also boast a special feature.

When you finish eating a glowcap, the batteries of any electronics you have on/in you are recharged up to potency%.
2015-12-05 03:35:23 -05:00
bgobandit 2eac6dd89e Blood tomatoes now produce O- blood. 2015-10-12 15:10:42 -04:00
xxalpha deb60ae309 Replaced /proc/is_sharp() with /obj/item/proc/is_sharp(). 2015-09-24 03:08:28 +01:00
duncathan 51c09f16bf makes all Destroy()'s return properly 2015-08-31 00:21:01 -06:00
phil235 94d072828f Merge branch 'master' of https://github.com/tgstation/-tg-station into CatchThrownPieFix
Conflicts:
	code/game/atoms_movable.dm
	code/game/objects/items/weapons/dice.dm
	code/game/objects/weapons.dm
	code/modules/flufftext/Hallucination.dm
	code/modules/mob/living/living_defense.dm
	code/modules/mob/living/living_defines.dm
	code/modules/reagents/reagent_containers.dm
2015-07-19 21:53:39 +02:00
Firecage 4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
phil235 b570af6795 Fixed catching banana creampie in mid throw (and similar objs). 3824 10536 (hitting a wall now makes the smashed pie effect appear ON the wall)
Moved last_bumped var from movable to living.
Renamed /obj/machinery/field/proc/bump to bump_field() to avoid confusion with Bump(). Same thing with /obj/effect/mine/Bumped() -> triggermine().
Fixes sprite when hunter leaps into a wall. 10428
Removed some commented code here and there.
Remove allow_spin var, throw_at now uses a spin argument for that.
Throwpass atom var is no longer used to check whether thrown stuff can pass stuff (now using CanPass() proc like everything else), the var is still used for some adjacency click check.
A thrown mob hitting another mob now produces a sound; also thrown mob and target one no longer swap places even on help intent.
A thrown mob now is lightly hurt (and weakened) if he hits a wall/mob/dense object. Nerf the damage when thrown mob hit wall.(20 -> 10)
Thrown obj/mob no longer bounces off wall unless it's no grav. Heavy thrown items now push an unanchored obj/mob target.
Fixes losing all momentum when getting out of a thrown closet. 6569
A lot of work on throw_at, throw_impact, and hitby to make the code more OOP. Thrown items no longer collide with border items on the side. 10479
Fixes the killer crusher. 10507
2015-07-14 00:51:19 +02:00
Ikarrus 8759f56f6f Squashed Commits 2015-06-27 00:09:16 -06:00
xxalpha b2e84a0d3c Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip( 2015-06-14 20:11:40 +01:00
SconesC 94814445b4 Fixes minor typo 2015-05-20 18:01:05 -07:00
phil235 4a8e168ff3 - admin revive clears addiction list. 8894
- buffed capsaicin/frost oil temperature effects as well as basilisk temperature effect (to counterbalance the recent change in natural bodytemp stabilization). And slight nerf to ghost chili temp boost when held in hand (for consistency). 8501
- fixes religion name choice window labeled as mime name
- fixes nearly invincible larva 9223
- your health/status now updates immediately after taking damage, we don't wait for the next life(). 7031
- Fixes alien nest overlay not updating when dead mob is gibbed by larva exit. 8523
- fixes flamethrower tablecrafting. 9261
2015-05-01 19:45:36 +02:00
kingofkosmos a7bd5f93e1 "You hear something" set to italics. 2015-04-24 21:06:16 +03:00
kingofkosmos 1d14471d00 Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark. 2015-04-24 20:50:50 +03:00
phil235 f9f618d699 Adding the chemical reactions and recipes for the new recipes.
Changes the glasses of what? to use an overlay with reagents color.
Adding a ricepack to the kitchen cabinet and the food crate.
Adding more bowl to the dinnerware vending machine.
Adding pumpkinjuice, blumpkingjuice, cherryshake, bluecherryshake pumpkin latte, drunken blumpkin reagents.
2015-04-04 19:29:12 +02:00
Cheridan 884e9e3774 Day Who-Knows: Bar Gambling Expansion!
Space cash is stacks
Adds dealer table to map
2015-03-29 18:09:54 -05:00
Razharas a67d8339b7 Merge pull request #8414 from phil235/TablecraftVarietyFix
Fixes not being able to tablecraft recipes using differen kinds of an item
2015-03-22 05:32:43 +03:00
Razharas 2271499db7 Merge pull request #8058 from Iamgoofball/explosive
GOONCHEM 5: Pyrotechnics are finished, Toxins mostly complete
2015-03-21 09:54:11 +03:00
phil235 9b419d26f0 Fixes not being able to tablecraft recipes using different types of an item for a requirements (e.g. two types of cutlets to make a meat pizza).
Fixes mushroom requirements in tablecraft recipes appearing as "snacks" in the requirement lists.

Reduces the chem puff waiting time when spraying at short range, so it takes less time before it reacts with a turf/mob/object.
2015-03-18 20:57:30 +01:00
phil235 e3e881e6ee Merge branch 'master' of https://github.com/tgstation/-tg-station into MimanaFix
Conflicts:
	code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm
2015-03-15 12:27:40 +01:00
Iamgoofball d0f101cd37 Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive
Conflicts:
	code/modules/reagents/Chemistry-Recipes.dm
2015-03-14 21:32:13 -07:00
phil235 7ba8af5222 Fixes steel cap bug. Steel cap now growns steel logs similar to wooden logs, you use the hatchet to get rods.
Reorganizes all flashing to use the same mob proc 'flash_eyes()' (welding tool use, flashbang, flashers, laserpointers, etc).
Fixes making sandstone not stacking the result sandstones on the floor.
Sandstone, grass tile and carpet tile now look for other incomplete stack on their creation location to try to put them all in one stack (exactly like wood planks).
Fix typos.
Remove banglet var from all flashbangs, making flashbangs from clusters behave exactly like the other ones.
Renames eyecheck()proc to check_eye_prot() and moves it to mob/living level, elso creates check_ear_prot() for checking ear protection.
2015-03-10 20:30:46 +01:00
Iamgoofball 2cee886f04 whoops and shit 2015-03-08 17:02:38 -07:00
Iamgoofball 573aea927b Removes newcrit, fixes, changes, old chems now process every tick as per usual, only goonchems process every 3 ticks now. 2015-03-08 16:43:57 -07:00
Iamgoofball e6f257d413 Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive
Conflicts:
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/carbon_defines.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Goon-420BlazeIt.dm
	code/modules/reagents/Chemistry-Goon-Pyrotechnics.dm
2015-03-08 14:26:52 -07:00
phil235 b669f363d3 Fixes mimana not dropping mimanapeel when eaten.
Fixes typo in oat stalks
Fixes Reagent metabolization only calling the reagents on_mob_life procs once every two life().
Moving dizziness, drowsiness and jitteriness natural decreases all inside carbon/handle_regular_status_updates()
Drowzyness now drops faster when resting.
Slight adjustment to mutetoxin effect on mob.
2015-03-08 13:53:23 +01:00
phil235 d856e240c2 Merge branch 'master' of https://github.com/tgstation/-tg-station into NewPlants
Conflicts:
	icons/mob/head.dmi
2015-03-02 13:45:15 +01:00
Iamgoofball b1f60a6114 GOONCHEM 5.5: MORE TOXINS 2015-02-28 12:26:34 -08:00
Iamgoofball b95f44f235 Loads of pyrotechnics changes 2015-02-27 21:16:10 -08:00
Iamgoofball 16f319bffd I apparently added morphine to Deus. This was not intended. 2015-02-26 20:27:14 -08:00
phil235 809a1be279 Merge branch 'master' of https://github.com/tgstation/-tg-station into NewPlants
Conflicts:
	icons/mob/head.dmi
2015-02-25 18:50:42 +01:00
Razharas 4ba5161394 Merge branch 'master' of https://github.com/tgstation/-tg-station into FUCKGIT
Conflicts:
	code/modules/hydroponics/seeds.dm

Resolving dem conflicts
2015-02-25 15:17:14 +03:00
Razharas 588c79873f Merge pull request #7562 from Iamgoofball/drugs
GOONCHEM: Part 4: Pyrotechnics, Drugs, and Misc. Chemicals
2015-02-25 08:26:21 +03:00
phil235 bd870d649c Adds new plants to botany (rice, oat, blue cherries, holy melon, parsnip, geranium, lily, snap corn, blumpkin, mimana, sweet potato, vanilla, red beet) and adding two new reagents (vanilla and rice). 2015-02-22 22:10:25 +01:00
Iamgoofball e24e94544e Merge branch 'master' of https://github.com/tgstation/-tg-station into drugs
Conflicts:
	code/modules/food&drinks/food/snacks_meat.dm
	code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
	icons/obj/drinks.dmi
	icons/obj/food.dmi
2015-02-20 22:00:53 -08:00
Remie Richards 5fc7af7fbf attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
Items reset their pixel_x and pixel_y values on pickup.
2015-02-19 13:02:43 +00:00
Razharas 5d0e800c3d Merge branch 'master' of https://github.com/tgstation/-tg-station into FUCKGIT
Conflicts:
	icons/turf/floors.dmi

Fixing merge conflicts
2015-02-17 20:33:52 +03:00
Cheridan 15439b8c4e Merge branch 'ObjProcessingFix' of git://github.com/phil235/-tg-station into phil235-ObjProcessingFix
Conflicts:
	code/game/gamemodes/wizard/artefact.dm
2015-02-15 10:27:50 -06:00
phil235 135293bedf Fixes object processing list by replacing "SSobj.processing.Add" by "SSobj.processing |= " to avoid having duplicated objects in the list, meaning the objects would be processed more than once per iteration.
Fixes Alien embryo processing that was processed twice.
2015-02-14 14:18:49 +01:00
Swag McYolosteinen b2d6ce5481 Merge pull request #7668 from dannno/suicidefix
Fixes #7647
2015-02-14 12:12:38 +01:00
Iamgoofball 99cab4ddcb Changes 2015-02-13 18:05:03 -08:00
Razharas 7571189a35 More vines for the god of vines
Added bluespace vines that are able to grow through walls, glass and
anything and everything
Added space-protective vines that change the space into "vineturfs"
which are basically resprited floors
Made vines be able to spread into space
Changed some vinecontroller vars, now you can adjust the speed of
spreading both by capping the max vines per tick and new-vines to
existing-vines spread ratio
Made the chance to mutate per spread be dependant on the potency of the
seed
Made the spreading speed be dependant on productivity of the seed(can be
both slower and faster then current one)
Fixed some potential runtimes with calling destroy() instead of qdel()
where needed
Removed the colon added by carn, its all checked in Enter call few lines
later anyway
I like vines
2015-02-13 01:13:13 +03:00
dannno b34c5180ae modifies and fixes suicide messages for guns and bananas 2015-02-11 22:39:11 -05:00
phil235 c70d17a8eb Rebalancing vitamin amounts in grown
Fixing some sugar amounts in 2 growns
Fixing error from metastation z2 mapfile.
2015-02-08 22:48:53 +01:00
Iamgoofball fa32a61494 Loads of new chemicals and changes 2015-02-07 21:55:21 -08:00
Iamgoofball 0864e4a8dc Merge branch 'master' of https://github.com/tgstation/-tg-station into drugs
Conflicts:
	code/modules/reagents/Chemistry-Goon-Medicine.dm
	code/modules/reagents/reagent_containers/pill.dm
	icons/obj/drinks.dmi
2015-02-07 15:46:12 -08:00
phil235 35fb458293 Merge branch 'master' of https://github.com/tgstation/-tg-station into CookingOverhaul
Conflicts:
	code/modules/food&drinks/food/snacks_other.dm
	icons/obj/drinks.dmi
2015-02-07 20:22:49 +01:00