Commit Graph

91 Commits

Author SHA1 Message Date
Mloc-Argent
a1f55a50b1 Massive click code rework by SuperSayu, ported from TG.
Full details at https://github.com/tgstation/-tg-station/pull/1206
Fixes #3648

Hopefully done right this time.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-10-08 20:27:39 +01:00
Zuhayr
486f46d71e Moved around podmen code, adjusted a lot of strings, rewrote/modified a lot of the podman generation code, added podman icons, commented out potato person green tint. 2013-07-31 04:17:17 -07:00
NerdyBoy1104
390029007d Added Rice and Plastellium plants. Rice stalks are grinded into rice that you can make boiled rice, rice pudding and Sake from. Plastellium is refined into plastic by grinding it into plasticide. 20 plasticide + 10 poly acid makes 10 sheets of platic which can be used to make crates, forks, spoons, knives, ashtrays or plastic bags from. 2013-04-23 22:52:08 +01:00
Cael_Aislinn
bb5a349fcf Merge branch 'incremental_tg' r5600 into bs12_with_tgport
Conflicts:
	baystation12.dme
	code/__HELPERS/global_lists.dm
	code/controllers/master_controller.dm
	code/game/gamemodes/events/ninja_equipment.dm
	code/game/gamemodes/events/space_ninja.dm
	code/game/gamemodes/wizard/rightandwrong.dm
	code/game/hud.dm
	code/game/jobs/job/captain.dm
	code/game/jobs/job/job.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/science.dm
	code/game/jobs/job/security.dm
	code/game/machinery/computer/cloning.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/weapons/gift_wrappaper.dm
	code/game/objects/items/weapons/implants/implantnanoaug.dm
	code/game/objects/items/weapons/storage/uplink_kits.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/game/turfs/turf.dm
	code/modules/client/client defines.dm
	code/modules/client/client procs.dm
	code/modules/clothing/masks/miscellaneous.dm
	code/modules/clothing/shoes/miscellaneous.dm
	code/modules/clothing/under/ties.dm
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/silicon/say.dm
	code/modules/mob/mob_defines.dm
	code/modules/paperwork/clipboard.dm
	code/modules/paperwork/pen.dm
	code/modules/paperwork/stamps.dm
	code/modules/projectiles/projectile.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/reagent_containers/glass.dm
	code/setup.dm
	config/config.txt
	html/changelog.html
	icons/effects/effects.dmi
	icons/mob/feet.dmi
	icons/mob/head.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/mask.dmi
	icons/mob/suit.dmi
	icons/mob/ties.dmi
	icons/mob/uniform.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/masks.dmi
	icons/obj/clothing/shoes.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/clothing/ties.dmi
	maps/tgstation.2.1.0.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-23 00:23:37 +10:00
johnsonmt88@gmail.com
1f07f31b64 Grammar fixes for item-suicides.
I got about half-way through changing these when SuperSayu came up and said he fixed this a while ago but never posted the fix. So technically half of these were fixed by me and half by him. Credit to both of us!

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5564 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-17 02:52:57 +00:00
Cael_Aislinn
bdeb96b7e5 Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport
Conflicts:
	baystation12.dme
	code/ATMOSPHERICS/components/unary/vent_pump.dm
	code/ATMOSPHERICS/components/unary/vent_scrubber.dm
	code/__HELPERS/game.dm
	code/controllers/shuttle_controller.dm
	code/datums/datumvars.dm
	code/datums/supplypacks.dm
	code/defines/obj/storage.dm
	code/defines/obj/vending.dm
	code/defines/obj/weapon.dm
	code/defines/procs/command_alert.dm
	code/game/area/Space Station 13 areas.dm
	code/game/atoms.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/events.dm
	code/game/gamemodes/events/dust.dm
	code/game/gamemodes/events/miniblob.dm
	code/game/gamemodes/events/ninja_equipment.dm
	code/game/gamemodes/factions.dm
	code/game/gamemodes/game_mode.dm
	code/game/gamemodes/gameticker.dm
	code/game/jobs/access.dm
	code/game/jobs/job/assistant.dm
	code/game/jobs/job/captain.dm
	code/game/jobs/job/civilian.dm
	code/game/jobs/job/engineering.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/science.dm
	code/game/jobs/job/security.dm
	code/game/jobs/job_controller.dm
	code/game/machinery/alarm.dm
	code/game/machinery/atmo_control.dm
	code/game/machinery/atmoalter/area_atmos_computer.dm
	code/game/machinery/bots/medbot.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/machinery/computer/ai_core.dm
	code/game/machinery/computer/atmos_alert.dm
	code/game/machinery/computer/card.dm
	code/game/machinery/computer/cloning.dm
	code/game/machinery/computer/computer.dm
	code/game/machinery/computer/message.dm
	code/game/machinery/computer/pod.dm
	code/game/machinery/computer/prisoner.dm
	code/game/machinery/computer/syndicate_shuttle.dm
	code/game/machinery/constructable_frame.dm
	code/game/machinery/doors/door.dm
	code/game/machinery/doors/firedoor.dm
	code/game/machinery/newscaster.dm
	code/game/machinery/recharger.dm
	code/game/machinery/spaceheater.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/machinery/telecomms/logbrowser.dm
	code/game/machinery/telecomms/machine_interactions.dm
	code/game/machinery/teleporter.dm
	code/game/machinery/wishgranter.dm
	code/game/mecha/mech_fabricator.dm
	code/game/mecha/working/ripley.dm
	code/game/objects/items.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/flashlight.dm
	code/game/objects/items/devices/radio/encryptionkey.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/stacks/medical.dm
	code/game/objects/items/weapons/cards_ids.dm
	code/game/objects/items/weapons/gift_wrappaper.dm
	code/game/objects/items/weapons/hydroponics.dm
	code/game/objects/items/weapons/manuals.dm
	code/game/objects/items/weapons/secstorage/secstorage.dm
	code/game/objects/items/weapons/storage/backpack.dm
	code/game/objects/items/weapons/storage/firstaid.dm
	code/game/objects/items/weapons/storage/kit.dm
	code/game/objects/items/weapons/storage/storage.dm
	code/game/objects/items/weapons/storage/toolbox.dm
	code/game/objects/items/weapons/storage/uplink_kits.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/game/objects/items/weapons/surgery_tools.dm
	code/game/objects/items/weapons/tools.dm
	code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
	code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
	code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
	code/game/objects/structures/electricchair.dm
	code/game/objects/structures/extinguisher.dm
	code/game/objects/structures/watercloset.dm
	code/game/objects/weapons.dm
	code/game/turfs/turf.dm
	code/game/vehicles/airtight/airtight.dm
	code/game/vehicles/vehicle.dm
	code/global.dm
	code/modules/DetectiveWork/evidence.dm
	code/modules/admin/IsBanned.dm
	code/modules/admin/player_panel.dm
	code/modules/admin/verbs/diagnostics.dm
	code/modules/admin/verbs/getlogs.dm
	code/modules/client/preferences.dm
	code/modules/clothing/masks/miscellaneous.dm
	code/modules/clothing/spacesuits/rig.dm
	code/modules/clothing/suits/miscellaneous.dm
	code/modules/critters/critter_defenses.dm
	code/modules/detectivework/scanner.dm
	code/modules/flufftext/Hallucination.dm
	code/modules/food/recipes_microwave.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mining/satchel_ore_boxdm.dm
	code/modules/mob/dead/observer/observer.dm
	code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
	code/modules/mob/living/carbon/alien/special/facehugger.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/carbon_defines.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/carbon/metroid/metroid.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/ai/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/mob_transformation_simple.dm
	code/modules/paperwork/clipboard.dm
	code/modules/paperwork/folders.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/paperbin.dm
	code/modules/paperwork/pen.dm
	code/modules/power/cable.dm
	code/modules/projectiles/guns/energy/special.dm
	code/modules/projectiles/guns/projectile/revolver.dm
	code/modules/projectiles/projectile/change.dm
	code/modules/projectiles/projectile/special.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/glass.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	code/modules/recycling/sortingmachinery.dm
	code/modules/research/designs.dm
	config/config.txt
	html/changelog.html
	icons/mob/head.dmi
	icons/mob/hud.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/mask.dmi
	icons/mob/suit.dmi
	icons/mob/ties.dmi
	icons/mob/uniform.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/masks.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/clothing/ties.dmi
	icons/obj/grenade.dmi
	icons/obj/projectiles.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-11 22:12:31 +10:00
petethegoat@gmail.com
11b17c4442 Committing suomynonAyletamitlU's storage item standardisation commit: http://forums.nanotrasen.com/viewtopic.php?f=16&t=11746
Standardization of the object tree and some modified functionality.
Moved a lot of storage/*_kit and similar boxes to storage/box/* ; most of these can now be found in boxes.dm. First aid kits remain a separate item type.
Replacement Light boxes pick up lights (for example broken ones) when used on them
Moved weapon/secstorage to storage/secure
Moved plant bags, ore satchel, trash bag, and sheet snatcher to storage/bag, in bags.dm
Fixed reagent_containers and snacks to pass through attackby() so the use_to_pickup code works. This affects plant bags, trash bags, and pill bottles.
Dice packs are now pill bottles, and all pill bottles can pick up dice.
Added error handling to uplink/generate_menu() so that one mistyped string doesn't bork the whole syndie uplink menu, since strings cannot be type-checked at compile time.
Cigarette packs and crayon boxes are now storage/fancy, however they retain existing update_icon() code.
Added a comment to storage.dm so that future people know where to look for use_to_pickup and allow_quick_gather code.

Updated all maps.

I've tried to test this thoroughly but I wouldn't be surprised if there were a few lingering issues. Try not to panic if you encounter any.

Full (i think) list of changed paths:
/obj/item/weapon/storage/flashbang_kit	> /obj/item/weapon/storage/box/flashbangs
/obj/item/weapon/storage/body_bag_box	> /obj/item/weapon/storage/box/bodybags
/obj/item/weapon/storage/chemimp_kit	> /obj/item/weapon/storage/box/chemimp
/obj/item/weapon/storage/trackimp_kit	> /obj/item/weapon/storage/box/trackimp
/obj/item/weapon/storage/seccart_kit	> /obj/item/weapon/storage/box/seccarts
/obj/item/weapon/storage/handcuff_kit	> /obj/item/weapon/storage/box/handcuffs
/obj/item/weapon/cigpacket		> /obj/item/weapon/storage/fancy/cigarettes
/obj/item/weapon/storage/mousetraps	> /obj/item/weapon/storage/box/mousetraps
/obj/item/weapon/storage/PDAbox		> /obj/item/weapon/storage/box/PDAs
/obj/item/weapon/storage/id_kit		> /obj/item/weapon/storage/box/ids
/obj/item/weapon/storage/lightbox/mixed	> /obj/item/weapon/storage/box/lights/mixed
/obj/item/weapon/storage/donkpocket_kit	> /obj/item/weapon/storage/box/donkpockets
/obj/item/weapon/storage/beakerbox	> /obj/item/weapon/storage/box/beakers
/obj/item/weapon/storage/syringes	> /obj/item/weapon/storage/box/syringes
/obj/item/weapon/storage/gl_kit		> /obj/item/weapon/storage/box/rxglasses
/obj/item/weapon/storage/diskbox	> /obj/item/weapon/storage/box/disks
/obj/item/weapon/storage/stma_kit	> /obj/item/weapon/storage/box/masks
/obj/item/weapon/storage/lglo_kit	> /obj/item/weapon/storage/box/gloves
/obj/item/weapon/storage/lightbox/bulbs	> /obj/item/weapon/storage/box/lights/bulbs
/obj/item/weapon/plantbag		> /obj/item/weapon/storage/bag/plants
/obj/item/weapon/storage/satchel	> /obj/item/weapon/storage/bag/ore
/obj/item/weapon/trashbag		> /obj/item/weapon/storage/bag/trash

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5494 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-08 19:11:56 +00:00
Cael_Aislinn
aae42d928a Merge branch 'incremental_tg' r5200 into bs12_with_tgport
Conflicts:
	baystation12.dme
	code/__HELPERS/global_lists.dm
	code/__HELPERS/type2type.dm
	code/__HELPERS/unsorted.dm
	code/datums/datumvars.dm
	code/datums/disease.dm
	code/datums/organs/organ_external.dm
	code/datums/supplypacks.dm
	code/defines/obj.dm
	code/game/area/areas.dm
	code/game/atoms.dm
	code/game/gamemodes/cult/cult_structures.dm
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/events.dm
	code/game/gamemodes/events/ninja_equipment.dm
	code/game/gamemodes/events/space_ninja.dm
	code/game/gamemodes/game_mode.dm
	code/game/gamemodes/gameticker.dm
	code/game/hud.dm
	code/game/jobs/access.dm
	code/game/jobs/job/civilian.dm
	code/game/machinery/alarm.dm
	code/game/machinery/cloning.dm
	code/game/machinery/computer/cloning.dm
	code/game/machinery/computer/medical.dm
	code/game/machinery/computer/syndicate_shuttle.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/machinery/telecomms/machine_interactions.dm
	code/game/objects/effects/decals/contraband.dm
	code/game/objects/effects/signs.dm
	code/game/objects/items/devices/PDA/PDA.dm
	code/game/objects/items/devices/PDA/cart.dm
	code/game/objects/items/weapons/photography.dm
	code/game/objects/structures/door_assembly.dm
	code/game/objects/structures/window.dm
	code/game/sound.dm
	code/game/verbs/ooc.dm
	code/global.dm
	code/modules/DetectiveWork/detective_work.dm
	code/modules/DetectiveWork/evidence.dm
	code/modules/DetectiveWork/footprints_and_rag.dm
	code/modules/DetectiveWork/scanner.dm
	code/modules/admin/player_panel.dm
	code/modules/admin/verbs/adminhelp.dm
	code/modules/admin/verbs/adminpm.dm
	code/modules/awaymissions/gateway.dm
	code/modules/client/client defines.dm
	code/modules/client/client procs.dm
	code/modules/client/preferences.dm
	code/modules/clothing/spacesuits/rig.dm
	code/modules/mining/machine_processing.dm
	code/modules/mining/machine_stacking.dm
	code/modules/mining/mint.dm
	code/modules/mining/ores_coins.dm
	code/modules/mining/satchel_ore_boxdm.dm
	code/modules/mob/living/carbon/alien/alien.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/carbon_defines.dm
	code/modules/mob/living/carbon/human/human_damage.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/say.dm
	code/modules/mob/mob.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/mob_transformation_simple.dm
	code/modules/mob/new_player/login.dm
	code/modules/mob/new_player/new_player.dm
	code/modules/mob/new_player/preferences_setup.dm
	code/modules/mob/new_player/savefile.dm
	code/modules/mob/new_player/sprite_accessories.dm
	code/modules/paperwork/folders.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/photocopier.dm
	code/modules/projectiles/guns/energy/special.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	code/setup.dm
	code/unused/mining/datum_processing_recipe.dm
	code/unused/powerarmor/powerarmor.dm
	code/world.dm
	html/changelog.html
	icons/effects/96x96.dmi
	icons/mob/head.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/hydroponics.dmi
	icons/obj/items.dmi
	icons/turf/areas.dmi
	icons/turf/walls.dmi
	maps/RandomZLevels/fileList.txt
	maps/RandomZLevels/spacebattle.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-07 00:23:22 +10:00
johnsonmt88@gmail.com
2c3ae32f04 You can now commit suicide using certain items! There will be more items to come, this really just lays the groundwork.
Credit goes to CodenameB and Spike68 for the original proposed commit. Althought it ended up changing, this commit still uses all of their suicide messages. Thanks to carn for pseudo-coding the base of the system that I ended up using to implement this.

The suicide verb checks the item in your active hand and calls that item's suicide_act(). (/obj/item/proc/suicide_act(mob/user)) The proc displays the suicide message to any viewers and returns a damage type. The suicide verb then applies 175 damage to the mob divided by the number of damage types. If the proc returns null (meaning that the item does not have a suicide_act() defined) the regular suicide occurs.

To any coder wanting to add items to this: 
- You MUST return one or more damage types. "return (BRUTELOSS|FIRELOSS)" for example.
- Please do not manually type in the item's name; use [src] to refrence an it instead. It'll save time down the road if an item gets renamed. It also helps handle any child of that item without copy/pasting the proc to each child.
- Please do not use 'usr' for anything.

Parrots can now see which item they are holding onto in the stat panel.

The toy crossbow should once again work properly. Fixes Issue 1227.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5468 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-05 03:56:24 +00:00
giacomand@gmail.com
43e06e4ebb AIs in intellicards will not be able to move their camera anymore. Limiting them to their own core vision.
Committing Zelack's cleanup and fixes from here:
http://nanotrasen.com/phpBB3/viewtopic.php?f=16&t=11056

Plantbags now correctly pick up plants from trays.
Using a hoe or injecting reagents updates the tray icon.
Plant Analysers now work on seed bags.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5173 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-23 23:01:04 +00:00
giacomand@gmail.com
a0e8bb51e0 -Increased the amount of units the sprayer used to make water slippery again.
-Added a verb to empty the contents of the sprayer onto the floor.
-Admin spawnable only poisonousness apple added.
-Apples will always be eaten in one bite, to balance it, the apple can only hold 20 reagents now.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5104 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-18 02:13:00 +00:00
d_h2005@yahoo.com
34905c08d4 Adds kudzu plants, which can be grown in hydroponics trays. They are only obtainable by injecting mutagen into a tray with lots of weeds.
Glowberries have uranium inside them now instead of radium, which caused overlap since glowshrooms also had radium.
Also tweaked cocoa pod sprites a little bit.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5081 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-15 23:56:28 +00:00
Cael_Aislinn
6bd0e536bd Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport
Conflicts:
	code/ATMOSPHERICS/pipes.dm
	code/datums/organs/organ_external.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/events.dm
	code/game/gamemodes/events/ninja_equipment.dm
	code/game/hud.dm
	code/game/jobs/job/captain.dm
	code/game/machinery/atmoalter/area_atmos_computer.dm
	code/game/machinery/recharger.dm
	code/game/objects/hud.dm
	code/game/turfs/turf.dm
	code/modules/client/client defines.dm
	code/modules/clothing/head/misc.dm
	code/modules/clothing/spacesuits/rig.dm
	code/modules/clothing/under/miscellaneous.dm
	code/modules/mob/living/carbon/alien/humanoid/hud.dm
	code/modules/mob/living/carbon/human/hud.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/carbon/monkey/hud.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/mob_helpers.dm
	code/modules/mob/mob_movement.dm
	code/modules/mob/screen.dm
	code/modules/paperwork/filingcabinet.dm
	code/modules/power/cable_heavyduty.dm
	code/modules/projectiles/guns/energy/temperature.dm
	code/setup.dm
	config/game_options.txt
	icons/mob/screen1_Midnight.dmi
	icons/mob/screen1_Orange.dmi
	icons/mob/screen1_alien.dmi
	icons/mob/screen1_old.dmi
	icons/obj/atmospherics/passive_gate.dmi
	icons/obj/pipe-item.dmi
	interface/interface.dm
2012-10-05 22:21:26 +10:00
d_h2005@yahoo.com
d8fcb3576f Commiting Pewtershmitz' wooden table and floor sprites.
Adds Cheri trees, sprites by Pewter. They're not in the vending machines yet, until we get some foods for them going.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4789 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-01 00:53:46 +00:00
d_h2005@yahoo.com
c6068fab48 Fixes issue 942, patch by Aranclanos. Wood now autostacks as well.
Commiting my spooky october ghosts!

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4763 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-28 02:55:05 +00:00
Erthilo
dd09c46595 Scrubbed Mime and Clown references. Fixed invisible mutantrace people. Added Tajaran to mutantrace options. 2012-08-23 16:20:40 +01:00
baloh.matevz
44fb70ffd4 - Changed all "male" and "female" assignments to use the constants MALE and FEMALE.
- Added a message_admins() message which is sent if a character setup mismatch is detected to help diagnose the problem.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4496 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-19 17:56:51 +00:00
baloh.matevz
f392067896 - Reagent code reorganization commit 3 (finalizing everything)
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4493 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-18 21:53:47 +00:00
baloh.matevz
ff55c845c1 - Fixed issue 810. reagent assignment in the harvested goods is now delayed by 0.5s, so the proc that creates the harvested goods upon harvest actually has the time to set the correct potency value and other values which affect the amount of reagents that harvested goods have.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4476 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-17 14:34:57 +00:00
d_h2005@yahoo.com
be3450d319 -Fixes the bug where matches would not light plasma.
-Fixes horrible chat spam when loading smartfridges up with plant bags.
-Fixes the bug where reishi mushrooms and broken wooden floors had ugly sprites.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4400 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-14 15:37:21 +00:00
petethegoat@gmail.com
f657677a99 Fixed issue 775.
Fixed issue 767.

The fix for issue 767 was to standardise spray bottle code (to some extent). If any issues come up with spray bottles, pepper spray, or chem sprayers, report them to me.
Cyborgs now recharge their pacid and lube, as the size of their bottles was quartered.

Changed the flash item_state to "flashbang", as it looks exactly like a flash.

There's some more grammar and text clean up too, mostly with crates and closets.

Finally, fixed some pipes in virology, and changed the librarian's den so the bookcases are at the top.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4394 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-13 18:24:34 +00:00
petethegoat@gmail.com
f295c3ab33 Updated space carp, walking mushrooms and killer tomatos to use simple_animal instead of critter code.
Notify me if any issues with them, or any simple_animal arise.

Fixed a few issues with space bears.

Slightly improved teleporter code, and did a few misc runtime fixes.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4258 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-31 21:22:42 +00:00
giacomand@gmail.com
059df7ef65 -Renamed "acid" to "sacid"
-Sorted the dispensable chemicals list alphabetically.
-Made the chemical dispenser use process() instead of calling itself in a spawn()
-Made the receiver and broadcaster easier to build (less parts)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4256 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-31 20:38:06 +00:00
elly1989@rocketmail.com
92dd10f892 Tidied up on_consume() and the trash code for snacks.
Trash is now the path for the trash-item prototype (the thing it will spawn when you finish eating). This removes the need for a switch. Only obj/item/ paths may be trash.

You can also set var/trash to any obj/item to dump that item as trash. This is now used by the fortune-cookie rather than giving it its own proc for no reason.

This resolves issue 687

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4201 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-28 13:05:46 +00:00
giacomand@gmail.com
b026ada41f Fixed a typo which caused Reishi to not produce seeds.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4200 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-28 04:48:05 +00:00
giacomand@gmail.com
296d21251f Renamed the Space Shroom to Reishi.
Fixed some mistakes.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4186 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-26 19:04:43 +00:00
giacomand@gmail.com
ec8a7d7bcb -Added a new mushroom, the space shroom! (Original Title Do Not Steal) It has relaxing properties with a small amount of space drugs and sleeping toxin. I added this to allow the cutlery jobs (Chef & Bartender) a secondary access to anaesthetics; instead of having to ask Chemistry all the god damn time.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4183 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-26 13:34:50 +00:00
johnsonmt88@gmail.com
c930622bea Attack verbs!
Instead of 'x has been attacked with y by z' it now reads 'x has been 'y.attack_verb-ed' with y by z'!
Example:
Monkeyman has been bashed in the head with a riot shield by Nodrak!
or
Monkeyman has been stabbed in the chest with an energy sword by Nodrak!

- Every obj now has a list named "attack_verbs"
- When declaring an object, just use attack_verb = list("verb1", "verb2") and so on to initialize the list for that specific item.
- I've added a bunch of these to a ton of items already, feel free to modify or add more. Just try to stay away from gimmicky verbs (clown stuff being the exception.)

clothing.dm and spawner.dm only had a single definition in each of them, so their definitins have been moved to obj.dm and their original dm files deleted. I'm not sure about spawner but clothing had all of its other definitions removed recently.

radio.dm was a completely blank file, so it was removed.

Changelog updated

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4182 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-26 05:21:24 +00:00
sieve32@gmail.com
459c558898 -Make holodeck eswords a child of obj/item/weapon/holo instead of regular eswords, clumsy check removed as a result, and you can no longer do things like cutting through walls or doors or what have you. (Fixes Issue 665)
-Redid icons to be more optimized at compile by setting icon = 'icons/folder/icon.dmi' instead of just icon = 'icon.dmi', meaning that Dream Maker doesn't have to search through every single file for every single .dmi. This shouldn't lead to any errors because of how I went about it, plus the fact that Dream Maker would have freaked out if I screwed something up. Also moved around 2 icons that weren't sorted well.

r4146 compile time: 1 minute, 40 seconds
r4147 compile time: 45 seconds

[VGTG]

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4147 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-23 00:48:51 +00:00
johnsonmt88@gmail.com
54bbcff613 Bugfixes!
Tripled the chance for random events to happen.
- Old: 1% every 5 minutes.
- New: 3% every 5 minutes.

Door bolt clicks are now only heard by people near the door. Fixes Issue 563.

Fixed being able to bypass a windoor construction step.

Chaplains are no longer forced into christianity and can choose their own religion. Fixes Issue 658

Plant-B-Gone:
- It now lists the regents inside when examined. Fixes Issue 656.
- Fixed a typo in the description.

Antagonists are now logged at round end.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4080 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-15 23:31:21 +00:00
d_h2005@yahoo.com
507aeac51e Fixing some derps:
-Cocoa pods no longer turn invisible at a certain point.
-Changed some dumb descriptions.
-Fixed larvae UI positioning
-Further adjusted capsaicin/frost oil. Cold is already lethal to metroids, so the extra damage stuff was redundant.
-Fix for somatoray runtimes when shot at metroids and xenos and stuff.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3970 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-02 20:20:13 +00:00
elly1989@rocketmail.com
48088b79d9 ugh...this was horrible. I'm really sorry if I fucked anything up, I was literally going braindead towards the end.
Replaced every l_hand = and r_hand = and all that if(hand) crap to use standardised procs. This means we can use procs like Dropped() reliably as they will always be called when things are dropped.

Thorough documentation to come. But generally, if you want a mob's icons to update after deleting something in the inventory...use drop_from_inventory(the_thing_you_wanna_drop) just before deleting it. If you wanna put something in a mob's hands use put_in_hands() (or one of the variants). It'll try putting it in active hand first, then inactive, then the floor. They handle layers, overlays, screenlocs calling various procs such as dropped() etc for you. Easy

mob.equipped() is now mob.get_active_hand() because there was another totally unrelated proc named equipped() and stuff was confusing.

Weakening was made instantaneous.

Minor optimisations for human/handle_regular_status_updates(). I'll port these changes over to the other mobs next. Basically it should stop it constantly incrementing every status effect even after death.

umm... bunch of overlays related fixes... I think that's everything. :/

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3900 316c924e-a436-60f5-8080-3fe189b3f50e
2012-06-23 21:24:45 +00:00
d_h2005@yahoo.com
b4db0b5081 -Apples have potency now, and can be mutated into golden apples.
-Added a couple salads and golden apple tarts for the chef.
-Renamed the 'sleep rejuvinate' chemical and gave it a new id. If there was a REASON for it having the same ID as sleep toxin(i can't imagine why), please comment.
-Capsaicin and Frost Oil reworked heavily. They now make you much hotter/colder depending on how much you consume. It's not really wise to consume either in excessive amounts. Drinking coffee removes some frost oil from your system.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3891 316c924e-a436-60f5-8080-3fe189b3f50e
2012-06-23 06:57:24 +00:00
d_h2005@yahoo.com
040d885a9a -Modified effect of blue-space tomatoes somewhat. If they're not strong enough to do anything, they just splat.
-Both Ambrosia forms have had their reagent contents modified to prevent going over the 50-unit cap at high potencies. Fixes issue 469. Ambrosia Deus now contains space drugs instead of poison, as it ended up being more deadly in practice than I intended.
-Drinking milk removes capsaicin from your body~
-Frost oil should hurt less upon consumption.
-Liquid plasma can be converted back into solid plasma sheets, by mixing 20 plasma, 5 iron, and 5 frost oil.
-Pumpkins can be carved with knives now.
-Added additional checks to prevent hydro tray stats from going out of bounds when injected with certain chemicals.
-Added effects for holy water on hydro trays.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3883 316c924e-a436-60f5-8080-3fe189b3f50e
2012-06-21 03:16:29 +00:00
baloh.matevz@gmail.com
18ccabb33a - Removed support for the ONBACK and ONBELT flags.
- Replaced them with a whole range of inventory slot flags. These now govern whether an item can or can't be placed in a certain inventory slot. See setup.dm for information on the flags. These flags only affect humans tho, as humans are the only beings with an inventory to talk of.
- Standardized some gun code and some other pieces of code as I came accross them. I hate indented variable definitions!

This commit should not bring any change whatsoever to the game from a player's perspective.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3659 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-25 07:38:36 +00:00
johnsonmt88@gmail.com
d2736aa6ea Committing from the Proposed Commit forum:
Work by Neek
- Hulk Hogan moustache fix

Work by Yvarov
- Alien Unconciousness fix (Fixes Issue 283)
- - Also commented out alien snoring all over because aliens don't snore.
- Replacement light box fix (Fixes Issue 398)
- Syringe gun attack logs added (Fixes Issue 465)

Work by QualityVan
- Nettle and Death Nettle force based on potency.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3593 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-14 16:47:19 +00:00
d_h2005@yahoo.com
7cc62d2e7e -Laser tag guns no longer give combat tech of 3.
-Cardborg Helmets and Cueball helmets no longer protect as well as sec helmets. Reorganized the clothing/head.dm. PLEASE take note of the parent when making child objects, people.
-Laser tag vests can now hold their matching laser tag guns.
-Harebells can now be harvested.
-Sprite for the new mini-extinguishers in the extinguisher closets. Needs supporting code still.
-Added towel sprite to items.dmi.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3582 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-12 00:36:32 +00:00
d_h2005@yahoo.com
eb96b1fba3 -New black pressure tanks sprites, at the behest of Petethegoat,
-Uploading Invisty's backpack storage message tweak.
-New plant mutation for blue-tomatoes: Blue-space tomatoes.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3527 316c924e-a436-60f5-8080-3fe189b3f50e
2012-04-29 03:11:52 +00:00
d_h2005@yahoo.com
7ebdd0ee6e -Added sprites for fat hulks and fat lizardmen. Have fun with that, weirdos.
-New carrot in-tray sprites.
-Added define for bottle of adminordrazine and supporting code for injecting adminordrazine into plants. Basically for debugging, so I don't have to spend 10 minutes injecting plants with mutagen each time.
-Raised the passive species-mutation chance slightly. For real this time.
-Added sprites for red and yellow floorbots into aibots.dmi.
-New PDAs for the botanists and librarian. Sprites for cartridges for both too. (There's some work into a botany cartridge but it's commented out for now)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3498 316c924e-a436-60f5-8080-3fe189b3f50e
2012-04-23 20:51:23 +00:00
d_h2005@yahoo.com
41ba8a7ae6 -Added soil to plant seeds in. Make it by crushing up sandstone. Soil does not have indicators like trays do! Watch your plants carefully!
-Added money trees. When life gives you lemons, mutate them into cash.
-RnD can create a new tool for botanists: The floral somatoray. Has two modes. Use it on your plants to induce mutations or boost yield.
-Raised the passive species-mutation chance slightly.
-Fixed a goof I made before when I was editing poppies. Woops.
-Changed the name of "Generic Weeds".
-Normalized grass harvests.
-Couple of typo fixes.
-Updooted my changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3495 316c924e-a436-60f5-8080-3fe189b3f50e
2012-04-22 05:55:33 +00:00
d_h2005@yahoo.com
19d6e40bae -Added chawanmushi recipe and beet soup recipes. Added a trash plate to metroid sammiches.
-Ambrosia vulgaris now has a mutation. 
-Added 1% chance for a species mutation whenever a plant's stats mutate.
-You now get more descriptive messages when applying mutagen to plant trays.
-Removed sugarcane seeds from the vending machine. They were redundant and had poor sprites and no recipes. Added the seeds to the seeds crate so you can still get them, if you really want to...

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3460 316c924e-a436-60f5-8080-3fe189b3f50e
2012-04-15 19:21:11 +00:00
d_h2005@yahoo.com
a5eaa18d21 -The biogenerator is now more robust. It can dispense fertilizer in batches, and make simple leather items at a high cost.
-Watermelon and pumpkin biomass lowered a bit so biomass isn't totally trivial to acquire.
-Added more wood items for tower cap wood construction: Wooden doors and sandals.
-Added plump helmet biscuits and mushroom soup to kitchen recipes.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3454 316c924e-a436-60f5-8080-3fe189b3f50e
2012-04-14 06:42:46 +00:00
elly1989@rocketmail.com
d775e1ac80 Runtime fixes for:
runtime error: Cannot modify null.layer. proc name: done (/obj/effect/equip_e/human/done) usr: Ramona Fawkes (/mob/living/carbon/human) src: the human (/obj/effect/equip_e/human)
call stack: the human (/obj/effect/equip_e/human): done() the human (/obj/effect/equip_e/human): process()

runtime error: Cannot execute null.use(). proc name: attackby (/obj/structure/barricade/wooden/attackby) usr: Jeffery Long (/mob/living/carbon/human) src: the wooden barricade (/obj/structure/barricade/wooden) call stack: the wooden barricade (/obj/structure/barricade/wooden): attackby(null, Jeffery Long (/mob/living/carbon/human)) the wooden barricade (/obj/structure/barricade/wooden): DblClick(the floor (159,129,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=15;icon-y=12;left=1;scr...")

Rewrote wielded weapons to be their own weapon subclass. There was no point having a var/wielded var/twohanded var/force_unwielded var/force_wielded for every damn item when there is only 1 wield-able weapon anyway. All the wield-able stuff is now in twohanded.dm

Changed the adminhelpsound to some creative commons sound I pinched. Until somebody can get a better one. I'm sick of MAAAAAAAAOOOOOOW.

All PMs trigger the adminhelp sound. That means when you OM a player they get the sound, if a admin is PMed they only hear it if their adminhelp sounds are enabled. This should allow people to get eachother's attention when t he chat is busy.

Fixed some bad code with poddoors (which is used for the shutters in QM)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3435 316c924e-a436-60f5-8080-3fe189b3f50e
2012-04-11 05:01:44 +00:00
d_h2005@yahoo.com
11a30e09b4 Bugfix: Pumpkins no longer disappear while growing in trays.
Bugfix: Potatoes and Pumpkins can be picked up in plant bags again.
Bugfix: Trying to make one of the new hydroponics items when the object is not on the ground (in-hand, backpack, etc) now works properly.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3405 316c924e-a436-60f5-8080-3fe189b3f50e
2012-04-06 00:14:09 +00:00
d_h2005@yahoo.com
3e6b0a2e61 More Hydroponics content, mostly!
-Added pumpkin pie and slices. Made with 5 milk, 5 sugar, 1 pumpkin, 1 flour, 1 egg.
-Added carved pumpkins/jackolanterns. Carve them with any of the usual things you use to carve things. They work similarly to hardhats.
-Eating corn now makes corn cobs. Carve them with a saw, a knife, or a hatchet to make a corncob pipe. Set up class for smoking pipes to make it easy for others to add more pipes as desired.
-Added the bit of transparency to biohelmets that they were always supposed to have, fixed the scientist helmet being over too far by 1 pixel when facing right (OCD)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3389 316c924e-a436-60f5-8080-3fe189b3f50e
2012-04-01 18:50:27 +00:00
d_h2005@yahoo.com
2d1bae935e Modest update to Botany.
-Enabled potato batteries. Make them by adding wiring. They're weak and unreliable, but might be useful in emergency outages.
-Added potency and bitesize variables to many plants that were missing it, along with some other minor adjustments to vegetation defines. Removed (unnecessary) default potency from grass seeds. Gave Ambrosia Vulgaris seeds default potency, but lowered the yield a bit.
-Deathberries now contain some lexorin as well as toxin, and as such are especially true to their name.
-Added splat ability to blue tomatoes and blood tomatoes. Blood-tomatoes will leave a blood stain on the floor. Blue-tomatoes will spill their slippery contents. Watch your step!
-Removed the undefined opium from poppies, replaced it with a painkiller that actually works (bicaridine).
-Bug that prevented tower caps from spawning as random weeds fixed.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3378 316c924e-a436-60f5-8080-3fe189b3f50e
2012-03-31 01:08:07 +00:00
petethegoat@gmail.com
80db6c22b0 Added Cheridan's hatchets!
Buffed stamped packing slips to be worth 2 supply points.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3298 316c924e-a436-60f5-8080-3fe189b3f50e
2012-03-15 16:14:29 +00:00
elly1989@rocketmail.com
9859a0b52f Committing fixes to code for examining mobs. Burn damage wasn't showing properly on some mobs. Fixed grammar, icons and stuff.
Added some  stylesheet classes. Approved by Urist. If you're adding game text, please use the class that best describes the text. This way all the text formatting can be edited from the stylesheet rather than traipsing through the code like I am.
Cyborg names reflect their module choice.
Cyborgs can no longer drop their module-items on conveyor belts.
Please remember to add the line: gender = PLURAL to any new item defines if the item is plural, ie metal rods and such.
Much more to come. ;-; Just need to check them and merge... why did I start climbing this mountain?

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3232 316c924e-a436-60f5-8080-3fe189b3f50e
2012-03-02 16:07:32 +00:00
trubblebass@gmail.com
c3ea06bac5 Botany fixes courtesy of Numbers:
- Adjusts a few nutrient values for plants.
- Fixes the weird messages produced by Chantrelles.
- Nettles breaking has also been fixed.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2666 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-12 00:23:11 +00:00
baloh.matevz@gmail.com
9c872b28e1 Reinforced metal renamed to steel, since that what it now is.
Steel floor tile renamed to metal floor tile to avoid confusion before it even happens
Grass plants in hydro will now actually make grass floor tiles instead of really awkward patches
You can no longer make steel via autolathe, you can however make metal, and inserting r-metal will still give you metal for use in the lathe
Added 10 sheets of steel to EVA and 10 units of steel to engineering


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2604 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-04 03:55:58 +00:00