Commit Graph

426 Commits

Author SHA1 Message Date
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
Cheridan 216630f1db Merge pull request #7572 from phil235/CookingOverhaul
Cooking overhaul
2015-02-12 08:01:17 -06:00
dannno b34c5180ae modifies and fixes suicide messages for guns and bananas 2015-02-11 22:39:11 -05:00
phil235 549b71a487 Merge branch 'master' of https://github.com/tgstation/-tg-station into CookingOverhaul
Conflicts:
	icons/obj/drinks.dmi

Fixing a couple typos. Making sure all eggs used in tablecraft recipes are boiled
2015-02-11 16:13:04 +01:00
TZK13 8ae7a739dd Lowered maximum amount of possible fire stacks even more. 2015-02-11 06:51:23 -06:00
TZK13 2e919da8ab Lowered maximum amount of possible fire stacks. 2015-02-11 06:23:44 -06:00
TZK13 edf3364765 Novaflowers now ignite people with the amount of fire stacks applied depending on potency and you can now juice whole watermelons. 2015-02-10 06:26:03 -06: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
Cheridan 5610b46a0f Merge pull request #7528 from paprka/clothessec
Some clothing changes
2015-02-07 17:00:36 -06: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
phil235 63456ef622 Many fixes. Adding custom pizza slices. Reducing amount of icons used. Adding a changelog. 2015-02-07 03:10:32 +01:00
TheVekter ff65ec2018 Fixed "Chilli" -> "Chili" and "Coco" -> "Cocoa". Pray it passes Travis. 2015-02-06 05:22:53 -06:00
Iamgoofball f6d7823fc2 Adds muriatic, caustic, and hydrochloride to maint loot 2015-02-05 18:57:58 -08:00
paprka c527491f41 Merge branch 'master' of https://github.com/tgstation/-tg-station into clothessec
Conflicts:
	icons/mob/uniform.dmi
	icons/obj/clothing/uniforms.dmi
2015-02-05 17:44:22 -08:00
paprka 2ef8848c74 adds ability to store ammo and any type of revolver in holster 2015-02-05 17:41:10 -08:00
phil235 3456b017b6 repo update 2015-02-05 23:00:59 +01:00
phil235 a296e8f6a1 Updating the cook book. Finishing giving filling color to growns. More fixes 2015-02-05 22:34:11 +01:00
phil235 faba71fcca Cooking overhaul: adding tablecraft food recipes, customizable food, food ingredients (from bay)
- converted the microwave recipes to tablecraft recipes
- Added customizable food (thanks iamgoofball)
- added food ingredients (from baystation)
- changing food recipes a bit (replacing stuff with the new food ingredients)
- repurpose the microwave to actually cook certain food items.
- bowl is no longer trash but a reagent_containers/glass that is used in salad/soup recipes
- Changed the hunger system a bit, sugar becomes a normal reagent again. Adding a junkiness var to foods to drain mob satiety.
- milk carton is now a condiment bottle
- slight buff to vitamin
2015-02-05 16:48:25 +01:00
dannno c4fccf2651 remove redundant message 2015-02-01 16:35:14 -05:00
dannno a8fd8d13fa how about i put you to sleep kraso
with a banana
by killing you with it
2015-02-01 16:33:50 -05:00
dannno f2ccc18c5c kill yourself with banana my friend 2015-02-01 14:19:17 -05:00
pudl 08f8bb3ce8 replaces all instances of pacid with facid 2015-01-21 20:17:23 -06:00
Iamgoofball b83ca5f8d1 Goon Chemistry: Addiction and Overdosing 2015-01-18 21:50:54 -08:00
Iamgoofball 38070820f3 Merge branch 'master' of https://github.com/tgstation/-tg-station into goonchem_shoehorn_backup 2015-01-16 17:25:50 -08:00
Iamgoofball f3398e58a9 Removes Star Trek chemistry and transfers us to Goon Chemistry. 2015-01-16 17:21:36 -08:00
tkdrg ac3c413f24 Merge pull request #6969 from Firecage/Biogenerator_stuff
Adds stuff to Biogenerator. STUFF!.
2015-01-16 17:31:25 -03:00
Firecage 204fdb8b2f Update to biogenerator stuff PR 2015-01-16 09:24:39 +02:00
Firecage 2aa837f8f4 Wrench/unwrench messages only one for hydro trays 2015-01-15 09:27:03 +02:00
Firecage e4e5c1ae62 This adds a delay to anchoring and unanchoring a hydroponics tray. 2015-01-15 02:45:51 +02:00
Firecage c1368f6816 Fixes what Miauw said with the secbelt thing. 2015-01-11 21:31:21 +02:00
Firecage 2e20b8ea91 Biogenerator stuff. 2015-01-11 16:53:41 +02:00
tkdrg 652c8f5741 Merge pull request #6818 from Ergovisavi/more_pod_cloning
Some replica pod cloning fixes
2015-01-06 22:53:41 -03:00
Ergovisavi 1cd8dd90b7 Fixing an issue that would prevent pod cloning from working if the mob leaves its body before blood is drawn 2015-01-05 06:25:48 -08:00
carnie a3f5e7ebfd Merge branch 'master' of https://github.com/tgstation/-tg-station into SubSystems
Conflicts:
	code/game/gamemodes/setupgame.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Machinery.dm
2015-01-04 01:52:14 +00:00
phil235 cf48bb8364 Fixes potato cell construction being broken
Fixes eggplant parmigiana recipe (it was inheriting reagent requirements from spaghetti). I changed recipes so that they never inherit items or reagents requirements from a parent recipe to make adding new recipes in each categories less prone to mistakes.
2015-01-02 18:18:26 +01:00
carnie a029a49392 SubSystem rewrite
Misc:

+Fixes unreported issue with initializing lighting on a specific zlevel

+Fixes two similar issues with moveElement and moveRange. Where fromIndex or toIndex could be adjusted incorrectly in certain conditions. Potentially causing bad-sorts, or out of bound errors.

+Rewrites listclearnulls(list/L) to no longer iterate through L.len elements for every null in the list (plus 1). i.e. went from L.len*(number_of_nulls+1) list-element reads (best-case), to L.len list-element reads (worst-case)

+New proc/getElementByVar(list/L, varname, value) which finds the first datum in a list, with a variable named varname, which equals value. You can also feed it atoms instead of lists due to the way the in operator functions.

+Fixes an unreported issue with Yota's list2text rewrite. Under certain conditions, the first element would not be converted into a string. Causing type-mismatch runtimes.

+New global map_ready variable. This is not fully implemented yet, but will be used to avoid duplicate calls to initialize() for map objects.

+All turfs now maintain references to all lights currently illuminating them. This will mean higher memory use unfortunately, due to the huge number of turfs. However, it will speed up updateAffectingLights significantly. I've used list husbandry to reduce baseline memory usage, so it shouldn't be any worse than some past atmos modifications memory-wise.

-Removed 'quadratic lighting', can add this back at some point. Sorry.

+modified the way lum() works slightly, to allow turfs to have overridden delta-lumen. i.e. space cannot be illuminated more than its default ambiance. This allowed removal of some iffy special-snowflake lighting areas implemented by somebody else.

+Lighting images in the dmi can now use arbitrary naming schemes. It is reliant on order now. This allows the dmi to be replaced by simply dropping in a new dmi.

-Removed all subtypes of /area/shuttle. Shuttles now create duplicate 'rooms' of /area/shuttle. (More on this later). This will conflict with most maps. Guide on how to fix to follow.

+All verbs/tools relating to world.tick_lag were refactored to use world.fps. However old config text for setting tick_lag will still work (it converts the value to fps for you)

+MC stats improved using smoothing. They now have their own tab so they dont get in the way when you're playing as an admin.

-removed the push_mob_back stuff due to conflicting changes. Sorry Giacom.

_OK, NOW THE ACTUAL INTERESTING STUFF_

Following systems moved over to subsystem datums:
air_master
garbage_manager
lighting_controller
process_mobs (aka Life())
nanomanager
power
sun
pipenets
AFK kick loops
shuttle_controller (aka emergency shuttle/pods), supply_shuttle and other shuttles
voting
bots
radio
diseases
events
jobs
objects
ticker

Subsystems hooks and variables should be commented fairly in-depth. If anything isn't particularly clear, please make an issue.

Many system-specific global variables have been refactored into

All tickers which previously used world.timeofday now use world.time

some subsystems can iterate before round start. this resolves the issue with votes not working pregame
2014-12-31 13:25:41 +00:00
Ergovisavi a9d7266ca2 Merge branch 'master' of https://github.com/tgstation/-tg-station into muh_mobs 2014-12-22 19:55:04 -08:00
phil235 d5a7d82959 Fixes a lot of "the the" in messages. 2014-12-16 22:59:55 +01:00
phil235 7bd9b86652 Changes the hunger system in various ways. New hunger hud icons. Food w/o sugar can be loaded in snack vending machines by anyone. Adding two new var for mobs "satiety" and "metabolism efficiency". Rearranging datum/reagents, all "good" medical reagents are under datum/reagent/medicine/ and all food&drink reagents are under datum/reagent/consumable. Adding a pizza crate to cargo orders. Growns and cooked food are given vitamins while junk food are all given sugar. Removed some unnecessary code in Chemistry-Reagents.dm .
high satiety+fed = higher metabolism_efficiency, lower if starving. Sugar digested drains satiety and vitamin raises satiety. Negative satiety means faster nutrition drop. Positive high satiety means lower chance to spread viruses. metabolism efficiency affect metabolization speed of healing and damaging reagents and the efficiency of bodytemp stabilization via calory use.
2014-12-11 20:46:27 +01:00
Ergovisavi c9700d6b12 -Attempting to make mobs less laggy in the event many hostile mobs are spawned near each other by narrowing their searching by default with a new var, removes ishuman check
-Humans create a unique faction on creation, and transfer it via cloning/replica podding etc
-Created slime faction, gives slime and slime men that faction
-Simultaneous goliath tentacling will no longer stack, and goliaths now have a "tell" when they're about to strike
2014-12-09 02:05:34 -08:00
tkdrg e2c15d5210 Merge branch 'master' of https://github.com/tgstation/-tg-station into hudwhyyoudothistome
Conflicts:
	code/modules/hydroponics/hydroponics.dm
2014-12-08 13:48:22 -03:00
Swag McYolosteinen 609807df75 Merge pull request #6199 from Ergovisavi/less_terrible_human_plants
Pod Cloning changes
2014-12-07 17:34:54 +01:00
tkdrg 3e97e935af /datum/atom_hud (Passive HUDs) bugfixes
Moves antag_hud image and datum to mind instead of mob.

Fixes mobs keeping data HUDs after transfer_to().
Fixes gibbed bodies losing their antag HUDs.
Fixes the data hud disappearing when dropping unrelated HUDs.

Fixes #6206
Fixes #6209
2014-12-06 15:05:23 -03:00