Commit Graph

14145 Commits

Author SHA1 Message Date
polyxenitopalidou
2a1bae5390 SUCCESFUL MERGE IS A GO
•Added east+west sprites for the lit hardhat. They were missing.
•Removed silly extra lines of code in the new foodstuffs, also changed the muffins recipe a bit since it's conflicting for some reason, and is producing donuts.



git-svn-id: http://tgstation13.googlecode.com/svn/trunk@76 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-07 22:38:00 +00:00
Skiedrake
19613cf1b8 Fixed stuff that went missing in the merge.
Although kept detective's revolver ammo at 5, instead of 7 to which someone had changed it.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@75 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-07 19:52:03 +00:00
Skiedrake
78fc52ef11 Merge to main from the hydroponics branch r57_skie_1.
Hydroponics update + bugfixes.
Consists of revisions: 
R58, R60, R67, R68, R73.


Combined changelog (from oldest rev to newest):

Put all hydroponics defines into one .dm file
Added functionality for nettles and made all currently growable plantlife work
Changed hydroponics layout
Added Hydroponics Supply crates and added weed/pest sprays into the current ones
at hydro
Fixed nettle hold graphics
Fixed vending machines showing hidden items.
Added Research Director hydroponics access and botanists tox access (already had
chem access, but no tox).
Hydroponics in great shape. Spank Numbers for final modifications before merging
to trunk. (weedkillers, pestkillers)
Added a seed vending machine.
Amanitas now poison, and the poison is nasty. Added a poison() proc to all
foods.
Added graphics for vertical and horizontal one-tile-wide tables. Put one inside
hydroponics.
New 'blur' texture when your vision goes blurry.
Fixed a typo in hydroponics code.
Added a disposal unit in hydroponics.
Added a how-to instructions paper in hydroponics.
Hydroponics in working order. Extra features still in developement.
Fixed weedspray and pestspray entries.
Removed chaplains random probability to have see_invisible 15 at start, because
it's reset to 0 right next world tick anyways.
Added burn() and drug() procs to foodstuffs.
Added drug effects to some mushrooms. Have a nice trip.
Made chilis heat you up and ice peppers freeze you down.
Fixed carrot's harvest icon (it didn't exist)


To-do: Mutagens and vitamins for hydroponics plants.
New mutations, recipes for cook, extracting stuff from plants.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@74 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-07 19:33:23 +00:00
polyxenitopalidou
b782759b3d Added fatguy directions East+West, engineering suit now has fat directions East+West too. Could someone continue work on this one too, im slowly making more and more fatsuits, and it'd be good to have some help. Just follow the general outline of the engineering fatsuit.
Also, removed the SLICES THE CHEESE/MEATBREAD message, it was broadcast to the world. The show_message proc doesn't fucking work no matter what I do, im getting undefined proc. So i removed it for now, replaced it with W.visible_message. Could someone fix this, somehow, then tell me what the bloody problem was?

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@72 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-07 08:48:33 +00:00
uhangi@gmail.com
70459e3e0f adding warden's hat
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@69 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-07 03:19:15 +00:00
n3ophyt3@gmail.com
a08a796810 Department-only radio messages are now a different color.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@66 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-06 21:31:50 +00:00
polyxenitopalidou
f8b4e2d2ad Final fix for meatbread and omelette making, better tray icon, new fatguy west+east icons, brb making the rest of the fatguy decals. A bit of work, sure, but im sure it can be done in a day or two
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@65 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-06 10:31:58 +00:00
polyxenitopalidou
c0a9db6274 Completely fixed the microwave to display and handle the cheese_amount var properly.
Included Skie's fix of the syringe gun firing at the table when placed on it.

ENOUGH WITH MY SILLY SMALL REVS.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@64 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-06 09:03:29 +00:00
polyxenitopalidou
a41e5eed2c •Added quick fix about processor not accepting the milk bottle
•Fixed blood decals and positioning of the chef's knife
•Actually included a log this time, derp
•Nutrition limit to get fat raised a lil' bit, from 400 to 600. We're gonna have a lot of fatsos now with meatbread. Working on East-West fatguy sprites.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@62 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-06 08:11:36 +00:00
n3ophyt3@gmail.com
17ec44fcfb Fixed an issue with the Intelicard.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@61 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-05 22:48:11 +00:00
polyxenitopalidou
fedd53e3b9 •Added kitchen stuff: Meatbread, Cheese wheel, Omelette Du fromage, Muffins. Kitchen knife now spawns in the chef's storage and can be used to slice the meatbread loaf or cheese wheel into wedges. Cheese wedges can be used in the microwave to make stuff. Cheese wheels made by using Milk (now spawns 8 bottles in the chef's fridge) on the food processor. Everything's got their respective icons.
•Cholesterol is out, for now. Shit doesn't work.
•Raised the YOU-ARE-FAT limit to src.nutrition > 600 instead of 400. Meatbread tends to make people fat, fast.
•Included a fix for the cleaner spraying when added to the backpack. Im such an uber haxxor

Files edited: 
code/defines/obj/weapon.dm
code/game/machinery/microwave.dm
code/game/machinery/processor.dm
code/game/objects/closets/kitchen.dm
code/game/objects/items/weapons/mops_cleaners.dm
code/WorkInProgress/Chemistry-Reagents.dm
code/WorkInProgress/Chemistry-Tools.dm
food.dmi
kitchen.dmi•Added kitchen stuff: Meatbread, Cheese wheel, Omelette Du fromage, Muffins. Kitchen knife now spawns in the chef's storage and can be used to slice the meatbread loaf or cheese wheel into wedges. Cheese wedges can be used in the microwave to make stuff. Cheese wheels made by using Milk (now spawns 8 bottles in the chef's fridge) on the food processor. Everything's got their respective icons.
Forkloads of food half-in, not yet working. Forks dont spawn but if someone gets his hands on one, he can hit the omelette with it and the fork will change its icon to a "loaded with omelette" fork. TO DO: Actually get the loaded fork to feed the user once he hits himself with it.
◘Recipes: Meatbread: 3 cheese 3 meat 3 flour Omelette: 2 eggs 2 cheese Muffin: 1 egg 1 flour
•Cholesterol is out, for now. Shit doesn't work.
•Raised the YOU-ARE-FAT limit to src.nutrition > 600 instead of 400. Meatbread tends to make people fat, fast.
•Included a fix for the cleaner spraying when added to the backpack. Im such an uber haxxor

Files edited: 
code/defines/obj/weapon.dm
code/game/machinery/microwave.dm
code/game/machinery/processor.dm
code/game/objects/closets/kitchen.dm
code/game/objects/items/weapons/mops_cleaners.dm
code/WorkInProgress/Chemistry-Reagents.dm
code/WorkInProgress/Chemistry-Tools.dm
food.dmi
kitchen.dmi


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@59 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-05 13:02:10 +00:00
only.lurking@gmail.com
6041ec5c69 Centralized SQL configuration data into dbconfig.txt. Server hosts should never have to edit their source to get their MySQL servers talking to SS13, now.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@57 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-05 04:29:17 +00:00
uporotiy
472eaac49a Janiborgs can now select a Chryssalid as their alternative sprite instead of being stuck with standard one.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@56 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-04 18:08:21 +00:00
datdoodlemaster@gmail.com
db4df45a88 Fixed the Detective's Revolver.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@55 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-04 15:41:40 +00:00
n3ophyt3@gmail.com
10b9671756 The Singularity now lasts roughly three times as long when released.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@54 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-03 23:56:36 +00:00
n3ophyt3@gmail.com
5ac60791c6 Commented out some debug code
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@51 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-02 23:34:54 +00:00
musketstgstation@gmail.com
549fb4ebf3 Brig door timer update - Rewrite for maintainability, some issues fixed, debug messages removed.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@50 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-02 23:31:58 +00:00
musketstgstation@gmail.com
5fac6d778d Donut boxes no longer eat items and disappear. Until a more permanent fix is in place, they also cannot be refilled with donuts.
Changelog updated.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@49 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-02 21:56:06 +00:00
uporotiy
d73f38d41a Aliens have hivemind now, used via 'say :a'.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@48 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-02 19:57:25 +00:00
only.lurking@gmail.com
d78827d4f3 Corrected a bug where cyborgs selecting "Standard" for their icon would choose an icon_state that didn't exist and become invisible, except for a pair of glowing red eyes.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@47 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-02 07:55:50 +00:00
n3ophyt3@gmail.com
3d2fc71af1 Ghosts no longer block emitter pulses.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@46 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-02 04:58:17 +00:00
only.lurking@gmail.com
d21fb5dbc2 Corrected karma database connect error to more accurately explain the problem.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@45 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-02 03:46:11 +00:00
n3ophyt3@gmail.com
bb5219f3d1 Fixed some issues with airlock electrification:
Permanently electrified airlocks weren't passing the "am I electrified?" check.
 Bumping airlocks open never checked for electrification.
 Multitooling the electrification wire no longer zaps you for thirty seconds.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@44 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-01 22:00:40 +00:00
Skiedrake
456a9d6da6 Added hydroponics crates, graphics and crates themselves into the code.
Added Weed-B-Gone into crates at hydro, also Weed-B-Gone functionality. 
Changed map accordingly. 
Added weedbgone as a reagent and a recipe for it.
Added new spray sound effects and updated/changed those that were used before for fire extinguisher, refueling/refilling, using cleaner and using weed-b-gone.
Removed thumbs.db added by TLE as I saw it unnecessary.
Added buzzing sound to be used later with Fly Amanitas.
Changed some fertilizer graphics in chemical.dmi to be prettier.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@42 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-01 17:54:19 +00:00
n3ophyt3@gmail.com
7509478125 AIs now properly enter their power loss routine if equipment power to the area they're in is severed.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@41 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-01 06:39:09 +00:00
only.lurking@gmail.com
90882eb82c Added libmysql.dll, a required file many lack to get the MySQL functions working.
Reverted air code configurations to default settings (originally changed to reduce lag at the cost of atmospheric accuracy.)
Modified drop_bomb() to use explosion(), now provides greater control over the explosion to the user.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@40 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-01 05:16:24 +00:00
n3ophyt3@gmail.com
c9c2f3c2ae Added a decoy AI that spawns in the AI core chamber on Malfunction rounds, to reduce metagaming.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@39 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-01 05:04:01 +00:00
Skiedrake
42b972c3a0 Large hydroponics update:
Changed: Larger hydroponics vat, wheat sprites.
Added: Weeds (4 growth stages + dead), harebells (growth stages + dead), nettles and death nettles (5 growth stages + harvestable + harvest=weapon + dead + seeds), Weed-B-Gone (sprite + item left&right hand sprites).

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@38 316c924e-a436-60f5-8080-3fe189b3f50e
2010-08-31 19:31:24 +00:00
musketstgstation@gmail.com
bcb90c5cd2 Brig door timers now display the time remaining.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@37 316c924e-a436-60f5-8080-3fe189b3f50e
2010-08-31 16:07:12 +00:00
musketstgstation@gmail.com
1f799b5f9c Renamed another couple of circuitboards for clarity
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@36 316c924e-a436-60f5-8080-3fe189b3f50e
2010-08-31 00:16:36 +00:00
Skiedrake
00366e184f Fixed invisible red chilis and invisible ice chili growth stages.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@35 316c924e-a436-60f5-8080-3fe189b3f50e
2010-08-30 21:50:33 +00:00
Skiedrake
87048bec4b New graphic for seed extractor. The sextractor.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@34 316c924e-a436-60f5-8080-3fe189b3f50e
2010-08-30 20:29:18 +00:00
musketstgstation@gmail.com
cb8461865a Fixed the blue-on-green link colour - this was unintended and totally unreadable
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@33 316c924e-a436-60f5-8080-3fe189b3f50e
2010-08-30 20:26:13 +00:00
musketstgstation@gmail.com
075bbe624e PDA graphical overhaul - manky LCD green background and appropriate icons. Icon-loading is handled in new_player.dm because doing it in the PDA caused slowdown and we only need to do it once.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@28 316c924e-a436-60f5-8080-3fe189b3f50e
2010-08-30 15:22:41 +00:00
only.lurking@gmail.com
162b1c5157 Added a schema script for setting up the SQL database.
Removed a few Goon-flavored default messages in favor of something more culture-neutral.
Removed a hardcoded mention of my name in one of the error messages broadcast to the end user.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@25 316c924e-a436-60f5-8080-3fe189b3f50e
2010-08-30 00:49:00 +00:00
musketstgstation@gmail.com
0842d9b33d Removed robotics crate, added mulebot crate (1 mulebot) and robotics assembly crate (4x flash, 3x prox sensor, 2x 10k power cell (NEW: /obj/item/weapon/cell/robotcrate), 1x electrical toolbox). Updated changelog.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@13 316c924e-a436-60f5-8080-3fe189b3f50e
2010-08-29 04:17:30 +00:00
musketstgstation@gmail.com
d4c61fd1d3 Three small changes - Buckets are now available from autolathes, added generic remote signaller cartridges to the Tool Storage vending machine, adjusted AI status display density to 0 by request of veryinky
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@12 316c924e-a436-60f5-8080-3fe189b3f50e
2010-08-29 03:06:13 +00:00
datdoodlemaster@gmail.com
92e2fedd2b Edits the Assistant Storage vendor into a separate object. Adds hidden item amount variable.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@11 316c924e-a436-60f5-8080-3fe189b3f50e
2010-08-29 02:13:44 +00:00
n3ophyt3@gmail.com
44e4cbca05 Traitor AIs no longer lose their law 0 in the event of power loss.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@10 316c924e-a436-60f5-8080-3fe189b3f50e
2010-08-28 20:06:21 +00:00
n3ophyt3@gmail.com
e77e0d0c36 Added a verb so admins can toggle off their rightclick verbs, for the sake of not having to fight through them when actually playing.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@9 316c924e-a436-60f5-8080-3fe189b3f50e
2010-08-28 20:05:51 +00:00
n3ophyt3@gmail.com
d5388d6d04 Traitor/Rev Head clowns lose the clumsy gene. This means that Rev Head clowns can convert people without dropping their flash. It also allows such gamemode-sanctioned naughty clowns to use looted security gear without fucking themselves over 50% of the time.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@6 316c924e-a436-60f5-8080-3fe189b3f50e
2010-08-26 18:56:28 +00:00
n3ophyt3@gmail.com
fddc8804e1 Modified the State Laws verb such that the AI can selectively not report some laws, so they don't have to manually copy/paste its laws when given a law they aren't supposed to report.
The Reset and Purge AI modules can now remove OneHuman laws. 

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5 316c924e-a436-60f5-8080-3fe189b3f50e
2010-08-26 04:01:11 +00:00
musketstgstation@gmail.com
df4fa001be Turned the non-functional Engineering Engine Monitor PDA app into a remote power monitor. Requires a functioning power monitor computer, if it's broken another should take over automatically if it exists or when you build one. First one to start up is the one that sends data to PDAs for now. Tested multiple power monitors at once, bombing and replacing computer. Didn't test dismantling the computer to see if that triggers the breaking code because it doesn't seem to be possible with this version of the power monitor.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4 316c924e-a436-60f5-8080-3fe189b3f50e
2010-08-26 01:49:57 +00:00
musketstgstation@gmail.com
95aff6acb6 Fixed some misnamed circuitboards.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3 316c924e-a436-60f5-8080-3fe189b3f50e
2010-08-26 01:45:05 +00:00
only.lurking
662c08272a git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2 316c924e-a436-60f5-8080-3fe189b3f50e 2010-08-23 14:29:20 +00:00