Commit Graph

129 Commits

Author SHA1 Message Date
crazyclonetheninja
7e655d1c96 Shotguns now use a list for ammo instead of 8 vars.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@629 316c924e-a436-60f5-8080-3fe189b3f50e
2010-12-15 21:50:28 +00:00
noisomehollow@lycos.com
2e6b2cffdc Flipped icon for nutrimat.
Added some more toy icons for future use.
Another revolver/gun sprite added. New gun added as admin-spawn only. Based on a forum sprite.
Moved some unused gun sprites from weapons.dmi to gun.dmi.
Modified toilet sprite.
Fixed toilet direction on Prison Station.
Made tape recorder smaller.
New d6 sprite.
Added a reinforced window to Engineering. Removed an Engineering locker from inside one of the grills.
Moved status displays inside Engineering.
Changed Beepsky's path, again.
Added a spell list to the wizard shuttle so you know what you can buy.
Fixed some disconnected APC in Warden's office.
Replaced identification computer with a prisoner management console on the Prison Station.
Placed explosive implant kit on Prison Station.
Removed clown's secret stash. It was placed there by mistake.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@603 316c924e-a436-60f5-8080-3fe189b3f50e
2010-12-13 07:31:55 +00:00
morikou@gmail.com
490dc13666 Implants, Explosions, and Carps, Oh my!
- New Implant: Explosive. Implant it into a prisoner and you can detonate it remotely from a Prisoner Management console (located on the prison station and in the Armory). Armor access required to activate the explosives. A box of the implants is located on the prison station and another in the Armory. WARNING: Implantation of a subject who hasn't been convicted of a felony is a felony under the Space Code of Justice. Detonation of an individual may be considered murder as if they were killed by any other method.
- Wardens office rearranged so that it's easier to get around and you don't accidentally open the door so much.
- Spess Carp! OH SHIT. You can beat them up assuming they don't eat you first. Can be found wandering in space. Be careful: They're fast and smart.
- New Random Event: "Unknown biological entities have been detected on the station, Please Stand By."
- Chicks! Can't do anything with them yet but they're cute!
- Poppy and Corn sprites added (growing, full grown, harvested, wilted, seeds, etc). Red, Green, and Yellow gelatin (because jell=o is copyrighted) sprites also added.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@601 316c924e-a436-60f5-8080-3fe189b3f50e
2010-12-13 04:26:17 +00:00
n3ophyt3@gmail.com
3a11f5828c RCD Disabler malf module now properly disables RCDs.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@544 316c924e-a436-60f5-8080-3fe189b3f50e
2010-12-05 21:12:25 +00:00
morikou@gmail.com
9815d0ff05 Hydroponics + ect Update:
* Hydroponics area re-arranged to require less running around.
* Both Nettles and Death Nettles now can be used in a blender to extact their reagents.
* Seeds Crates can now be ordered by the QM. Contains a packet of all the basic seeds available from the seed vendor.
* Exotic Seeds Crates can now be ordered by the QM. Contains one packet of the following each: Egg Plant, Nettle, Fly Amanita Mycelium, Liberty Cap Mycelium, Plump Helmet Mycelium
* "Egg Plant" added (not a typo). Eggs may not be used on Seed Extractor to make Egg Seeds (that would just be silly). The only way to get an Egg Plant is through mutating an Eggplant or an Exotic Seeds crate.
* Plant-b-gone spray bottles now kill weeds and pests better then before. Also slightly less toxic.
* Weed spray and Pest Spray both removed since they're redundant.
* Potatos added. Can be used to make Fries (Potato + Processor), Cheesy Fries (Microwave: Fries + 1 cheese), Loaded Baked Potato (Microwave: 1 Potato + 1 Cheese)
* Beaker I intended to add in previous update finally got added (in kitchen).
* AI can no longer pick plants in hydroponics. The Cybernetic Horticulturalist Society has filed a complaint.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@499 316c924e-a436-60f5-8080-3fe189b3f50e
2010-11-28 02:09:35 +00:00
musketstgstation@gmail.com
ea9cc90bab DENIED stamp and chief medical officer stamp added.
DENIED stamp spawns in QM office.  CMO stamp spawns in CMO office.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@466 316c924e-a436-60f5-8080-3fe189b3f50e
2010-11-19 23:10:25 +00:00
crazyclonetheninja
696a29a40d Added a way to teleport using obj/item/weapon/data/clown to the beach. Use on the teleporter computer for instant travel.
Minor map changes.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@451 316c924e-a436-60f5-8080-3fe189b3f50e
2010-11-19 00:11:07 +00:00
crazyclonetheninja
c53d46ac1f AI Liquid Dispensers have been added to the map. Currently use Turret Control sprites. Have twenty bursts of cleaning foam each with a ten second cooldown in between uses.
Clown stamp added to clown's backpack.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@441 316c924e-a436-60f5-8080-3fe189b3f50e
2010-11-17 22:48:59 +00:00
uporotiy
be044b18c8 -Finished work on the "cult" gamemode. I'll still add features to it later, but it is safe to be put on secret rotation now.
-Added an energy cutlass and made a pirate version of the space suit in preparation for a later nuke update.
-Changeling now ends 15 minutes after changeling death, unless he's ressurected.
-Further fixing of wizarditis teleporting into space.
-Fixed the wise beard sprite.
-Fixed missing sprite for monkeyburgers.
-Fixed Beepsky automatically adding 2 treason points to EVERYONE.
I believe that's everything.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@365 316c924e-a436-60f5-8080-3fe189b3f50e
2010-11-02 19:13:32 +00:00
musketstgstation@gmail.com
aff76097dc Added rubber stamps specific to each head of staff, these don't spawn yet. Added extra paper iconstates for the different stamp colours. Added a constant to the supply shuttle file in preparation for QM paperwork expansion.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@358 316c924e-a436-60f5-8080-3fe189b3f50e
2010-10-27 21:32:51 +00:00
uporotiy
5490a3e40e Changed a lot of things, too lazy to recall them atm. Attempted a shotgun-on-back fix, but didn't work.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@305 316c924e-a436-60f5-8080-3fe189b3f50e
2010-10-17 14:27:57 +00:00
uporotiy
139e7fd7e3 Library computer now has two additional functions, one of them only available via emag.
Added a new emote per request.
Added a description for the cap's antique laser gun.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@256 316c924e-a436-60f5-8080-3fe189b3f50e
2010-10-08 18:49:51 +00:00
uhangi@gmail.com
be00348fef Adding zlevel 8, for a game/rp element/admindickery thing.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@243 316c924e-a436-60f5-8080-3fe189b3f50e
2010-10-04 04:07:38 +00:00
uhangi@gmail.com
55147059c1 Combat shotguns, for admindickery.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@216 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-29 04:03:52 +00:00
uhangi@gmail.com
e700403b99 git-svn-id: http://tgstation13.googlecode.com/svn/trunk@214 316c924e-a436-60f5-8080-3fe189b3f50e 2010-09-29 02:41:02 +00:00
uhangi@gmail.com
5510426a47 no more shotguns on belt
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@199 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-28 00:56:19 +00:00
uhangi@gmail.com
f14e6b1d7b Barman's shotgun update.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@195 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-28 00:18:56 +00:00
uhangi@gmail.com
15118fb23b Added riot shields. Block bullets a large percent of the time, and blunt objects just as much as armor does. Also readded riot crate in QM. I did the inhand sprites, yay.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@183 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-27 03:13:49 +00:00
Skiedrake
d98a8b57c0 Added:
Numbers' hydroponics syringe injections:
Now you can put chemical solutions into hydrotrays and plants will react accordingly.
Minihoe for uprooting weeds safely. Added to hydroponics trays.

Changed:
Advanced ProcCall proc, now actually somewhat useful.
Blob expands faster again.
Slight Plant-b-Gone buff against alien weeds.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@125 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-21 02:55:21 +00:00
Skiedrake
54ce9c57c2 Made nettles less lethal. Now death nettles don't stun always, but on 20% chance, as it was supposed to be.
Improved plant analyzer, now you can also analyze harvested plants with it.
Modified hydroponics layout: added a blue toolkit, anti-toxins kit and changed floor textures some.
Added more drug effects to max potency drugs. This required a minor hud modification. (overlay effect scaling)
Made foods heal less, as eating almost anything instahealed you before.
Fixed minor hydroponics issue with plant-b-gone and adjusted some mutation/growth rates.
Mushrooms will now yield minimum one mushroom always when harvested. (sensible!)
Made the Hydroponics instructions paper a bit better.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@83 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-08 19:03:08 +00:00
Skiedrake
505665db80 Hydroponics bug fix: Plants were almost always mutating into other plants.
Plant-B-Gone is now effective against the blob.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@79 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-08 01:53:37 +00:00
Skiedrake
eb5394d3e7 Some hydro bugfixes. You can now extract seeds from nettles.
As they were of different object type, extractor didn't work with them.

Also adjusted poison effect a bit.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@78 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-07 23:51:57 +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
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
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
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
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
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