Commit Graph

907 Commits

Author SHA1 Message Date
StarSmasher 711ad88903 Fixes #9294
Adding 6 tomato juice to 50 protein doesn't really work if the maximum is 50.
Also fixed it in the vegetable pizzas.

Figured a quickfix would be better than a very delayed fix.
2015-05-25 22:26:55 +02:00
GinjaNinja32 3fb3a18f05 Supply shuttle and crate fixes
- Supply point generation no longer increases over time, leading to a total of around 45000 points generating after 150 minutes
- Supply packs can have access set as either a number or a list; either is transferred to crates' req_access var correctly
- Non-secure reagent cartridge crates no longer use secure crates
- Closet/crate examine now calls ..() in all circumstances, not just when the user is more than one tile away
- Possibly more I can't remember
2015-05-23 16:15:04 +01:00
Kelenius 360113850a Updates Chemistry-Readme.dm
Also removes one unused variable that I forgot to remove.
2015-05-21 12:43:28 +03:00
Zuhayr 93b014c699 Merge with dev. 2015-05-20 13:39:31 +09:30
Kelenius fd450561c2 Carbon now clears ingested chemicals
Also fixes a bug that made ethy-thing not work.
2015-05-19 15:41:14 +03:00
Zuhayr 358867f3b5 Major sheet and material refactor. 2015-05-17 01:46:53 +09:30
Zuhayr 83570a1a9e Merge branch 'materials' of https://github.com/Zuhayr/Baystation12 into dev 2015-05-16 23:35:05 +09:30
Zuhayr 150b24023e Renamed kitchen utensils. 2015-05-16 21:24:36 +09:30
PsiOmegaDelta 98fce1fa1e Merge pull request #9301 from Kelenius/ofChemAndRuntime
Fixes #9294
2015-05-16 13:47:05 +02:00
Zuhayr a32179a062 Renamed knives. 2015-05-16 20:54:34 +09:30
Zuhayr 8aa24b86bb Renamed shards, katanas, claymores. 2015-05-16 20:36:33 +09:30
Kelenius b4bfe917eb Fixes #9294 2015-05-16 12:05:14 +03:00
Zuhayr 5b9eefdebf Merge with dev. 2015-05-15 23:22:48 +09:30
Zuhayr 1e1471a601 Removes equip_e effect. Rewrites stripping, refactors cuffing. Fixes #8173. 2015-05-15 23:19:57 +09:30
Kelenius 10915eae24 Merge branch 'dev' into ofChemistryAndStuff
Conflicts:
	code/game/objects/effects/chem/chemsmoke.dm
	code/modules/customitems/item_defines.dm
	code/modules/projectiles/guns/launcher/syringe_gun.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
	code/modules/reagents/reagent_containers/food/drinks.dm
	code/modules/reagents/reagent_containers/pill.dm
	maps/exodus-1.dmm
2015-05-15 11:28:05 +03:00
Ccomp5950 1e6921f924 Merge pull request #9268 from Mloc/lightwrite
fix for "cleaning light"
2015-05-14 15:08:03 -04:00
Mloc d95701a7b5 fix for "cleaning light"
Signed-off-by: Mloc <colmohici@gmail.com>
2015-05-14 18:03:18 +01:00
Zuhayr 4e85c5f387 Dev merge. 2015-05-12 23:33:29 +09:30
Chinsky e9cc39039c Merge pull request #8946 from Zuhayr/miningstuff
Wall refactor/mining changes.
2015-05-12 13:13:31 +03:00
Zuhayr c8135cf87b Merge pull request #9205 from mwerezak/masks
Snacks, drinks, and pills now check mouth coverage
2015-05-12 18:11:48 +09:30
mwerezak b721eb36ef Span classes and visible_message(), changelog 2015-05-11 23:40:44 -04:00
Zuhayr 495952ff5d Changed steel material name to a define. 2015-05-12 13:08:41 +09:30
mwerezak b1bfbf346d Snacks, drinks, and pills now check mouth coverage
Mouth coverage is defined somewhat conservatively so that breath masks
and the like do not prevent eating. In general only things that
completely cover your face or head like gasmasks and space suit helmets
block eating and drinking, or forcing the same on someone.
2015-05-11 22:17:24 -04:00
Zuhayr 4cf296a6c9 First pass on custom item cleanup/refactor. 2015-05-12 10:53:16 +09:30
Zuhayr e28acd5045 Dev merge. 2015-05-11 18:45:14 +09:30
Zuhayr 6f41625752 Added construction drone sprites from Pawn. 2015-05-11 14:46:47 +09:30
Zuhayr bc50ba5166 Merge resolution. 2015-05-11 11:47:24 +09:30
Kelenius fedd0342a0 Minor chem fixes 2015-05-09 12:03:22 +03:00
Kelenius 80467f8fa6 Removes metorapan reaction 2015-05-05 12:01:02 +03:00
PsiOmega 1c38be5cfd Crayons are now children of pens. 2015-05-05 08:41:24 +02:00
Kelenius 873b38e0a5 Merge branch 'dev' into ofChemistryAndStuff
Conflicts:
	code/game/objects/effects/chem/chemsmoke.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
2015-05-04 22:36:35 +03:00
Kelenius e4ce047bd1 Chemistry-Reagents: absolute paths and split 2015-05-04 00:29:42 +03:00
Kelenius 4500eac948 Merge and removal of a wild file
Merge branch 'dev' into ofChemistryAndStuff

Conflicts:
	code/modules/reagents/Chemistry-Holder.dm
2015-04-29 14:20:44 +03:00
Kelenius bd6a8e4d54 Chemistry-Holder.dm: absolute paths 2015-04-29 13:53:04 +03:00
Kelenius a2cea5c49c Merge branch 'dev' into ofChemistryAndStuff
Conflicts:
	code/modules/reagents/Chemistry-Recipes.dm
2015-04-28 19:22:35 +03:00
Kelenius 185aadb5a9 Chemistry recipes: absolute pathing 2015-04-28 16:55:13 +03:00
Kelenius 948252d25b Removes unused files added by accident, separates reagent files 2015-04-28 11:00:56 +03:00
Kelenius 317abc6b79 Merge branch 'dev' into ofChemistryAndStuff
Conflicts:
	code/datums/recipe.dm
	code/game/machinery/bots/farmbot.dm
	code/game/machinery/bots/medbot.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/objects/effects/chem/chemsmoke.dm
	code/game/objects/effects/effect_system.dm
	code/game/objects/items/toys.dm
	code/game/objects/items/weapons/extinguisher.dm
	code/game/objects/items/weapons/mop.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/organs/organ_internal.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/Chemistry-Recipes.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
	code/modules/reagents/reagent_containers/pill.dm
	code/modules/reagents/reagent_containers/spray.dm
	maps/exodus-1.dmm
2015-04-28 10:49:26 +03:00
PsiOmegaDelta bf43270624 Merge pull request #9015 from Kelenius/ofChemAndOne
Chemistry update - part one
In spite of the sassy tone.
2015-04-28 08:39:27 +02:00
Kelenius d9e2947b32 Updates chemistry colors 2015-04-28 09:23:39 +03:00
Chinsky 1328414485 Merge pull request #8960 from mwerezak/item-color
Fixes #8577, cleans up item_color, clothing/under and backpacks
2015-04-28 06:25:35 +03:00
mwerezak 549270c73c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color
Conflicts:
	code/game/machinery/washing_machine.dm
	code/modules/mob/living/carbon/human/update_icons.dm
2015-04-26 14:53:01 -04:00
Kelenius b7a628d53d Merge branch 'dev' into ofBotsAndMobs
Conflicts:
	code/game/machinery/bots/cleanbot.dm
	code/game/machinery/bots/ed209bot.dm
	code/game/machinery/bots/farmbot.dm
	code/game/machinery/bots/floorbot.dm
	code/game/machinery/bots/medbot.dm
	code/game/machinery/bots/secbot.dm
	code/game/objects/items/robot/robot_parts.dm
2015-04-26 17:18:20 +03:00
Kelenius baf19eb862 Merge remote-tracking branch 'origin/dev' into ofBotsAndMobs 2015-04-26 15:47:38 +03:00
Kelenius 6d1614cb7a Updates bots to be mobs. Several changes.
General:
Bots are now /mob/living/bot. They support player control fully. Just in
case an admin feels like letting a ghost take control of beepsky or
something.
Since they are bots, spooders and whatnot will attack them.
They now don't need an open panel to be emagged.
Spawns replaced with do_after, meaning that they will stop
injecting/cleaning/repairing/arresting if pulled away.

Medbot:
Emagger is added to ignore list.
Will now inject spaceacilin regardeless of disease type and level.
Previously: only if disease was past stage 1 or airbone.

Cleanbot:
Patrolling rewritten. They now find a closest beacon, and go to the NEXT
beacon after the closest one.
They will not wiggle out when pulled.
They will now ignore (for a while) the gibs they make if odd button is
pressed.
They will now freely claim cleanables. Previously, they would not target
ones targeted by other bots.

Floorbot:
This was a helluva buggy one.
They will now build bridges (but still won't do random repairs) in space
area.
They will now build bridges even if the tile directly next to them in
that direction is tiled.
They will now ignore for a while a tile they can't reach. This is to
stop them from hopelessly targeting tiles under grilles for upgrades and
getting stuck.
They will now slowly (200 ticks for a tile) build new tiles on their
own.
They will now preserve tile's icon when repairing it like a player
would.
They will now place first rods, then tile when fixing space breaches.
Rod costs two tiles.
When emagged, they will first always tear off the tile, then will (over
triple the normal amount of time) breach the tile to space. There are
noticeable warnings for both actions.

Secbot:
Will no longer run away to patrol when panel is open.
Now deals stamina damage instead of instastuns.
Small delay between approaching the target and stunning them.
Laserbots axed.
Removed their weird EMP act.
Will no longer stun lying people, just cuff.
They will also demand surrenderring (lying down) before smacking you. If
target moves, or 5 seconds pass, it will attack.

Farmbot:
It's alive!
It has settings to: water trays, refill its own water, uproot weeds, add
nutriment (ammonia, internal synthesizer), collect produce, and remove
dead plants.
2015-04-26 15:30:11 +03:00
Zuhayr 79e3acc95e Finalized wall refactor. 2015-04-26 12:58:57 +09:30
Zuhayr dbf8e53020 Mass rename of 'metal' to steel, refactor of walls and falsewall mineral construction, refactor of materials and ores. 2015-04-26 12:53:26 +09:30
PsiOmega 1fea589ad7 Merge remote-tracking branch 'upstream/dev' into TheSummoning
Conflicts:
	code/game/machinery/cryopod.dm
	code/game/objects/items/weapons/clown_items.dm
2015-04-24 17:13:37 +02:00
PsiOmega e7d85f8edc Adds Destroys. 2015-04-24 17:11:14 +02:00
PsiOmega 1ae0ad6d92 Updates the atom_pool, now datum_pool, to handle any datum object.
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
2015-04-24 09:59:05 +02:00