Commit Graph

65 Commits

Author SHA1 Message Date
cib
42e21b3447 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-03-21 20:10:26 -08:00
cib
f041bc7063 Rebalance of the melee damage system.
- Heavy objects now take longer to swing and deal more damage.
- A hit to the head is more likely to knock you out.
- A hit to the torso with a heavy object is more likely to knock you down.
2012-03-21 20:10:13 -08:00
cib
a1f4738a67 Fix to toolbox swinging. 2012-03-21 17:46:07 -08:00
CIB
1dd17e60a3 Merge pull request #727 from SkyMarshal/Airlocks
Made appendicitis only happen once, jump to explosion link should work, hallucination improvement/sanchecking, increased the damage of things to pre-nerf levels.
2012-03-21 10:02:27 -07:00
SkyMarshal
b86cd6bda4 MAde appendicitis only happen once, jump to explosion link should work, hallucination improvement/sanchecking, increased the damage of things to pre-nerf levels. 2012-03-21 09:46:42 -07:00
Ren Erthilo
db134c759d Merge commit 'stash' 2012-03-20 17:31:49 +00:00
Ren Erthilo
e90493c41b On master: Change 01 2012-03-20 17:31:10 +00:00
cib
1c5d305bc6 Fixes to the toolbox and APC commits. 2012-03-20 04:40:54 -08:00
cib
a541d32381 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-03-20 03:53:46 -08:00
cib
6d979ae17b Toolboxes have a chance to swing open. 2012-03-20 03:53:12 -08:00
misterfox
64f50d0d04 Tajara stuff 2012-03-16 12:20:42 -04:00
Ren Erthilo
61a82b22bb Fix for labeling virus dishes. Removed health analyzer from first-aid kit.
Made bruise packs and ointment only work above 50 health.
Added advanced treatment for future use.
Made MD's and CMO spawn with health analyzers.
Reduced medical equipment in non-medbay areas.
Made Health Scanner HUDs displays more granular.
2012-03-15 21:46:11 +00:00
Ren Erthilo
27bb390d48 Corrected grammar and added descriptions. Changes Asimov to prevent some loopholes. Credit to Kaleb702. 2012-03-10 20:07:24 +00:00
SkyMarshal
b0eebb2edb Reverted some layer adjustments I did that seem to have broken things, bugfixes for operating tables, choking people, and CPR, giving. Also added sterile mask box sprite, and tossed the singularity crap into a spawn(0) to try and reduce lag. 2012-02-17 12:56:46 -07:00
CaelAislinn
558f31dd0a added power control module boxes and sprite, made orderable via qm (apc circuits)
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-01-30 04:24:59 +10:00
SkyMarshal
12afd61ffc Ported Uplinks, Door stuff, Hacktools, Compressed Matter implant. 2012-01-27 20:15:06 -07:00
SkyMarshal
d61626440c Response Team Update:
-Response team now have a pimp'n base, containing gear for the leader as well as Medical, Engineering, and Security special loadouts.
-TG updates for comms and mulebot
-Special medical tools for response team
-Increased time between events slightly.
-Map updated with nerfed comm satellite, and added Death Alarms in medbay in addition to the new Response Team area.
2012-01-25 11:51:55 -07:00
SkyMarshal
1bf1d5db1f Pimped out the response team. No jobs have stupid stuff spawn in their hands, it now spawns on their person, be it on their ear (pens if they cannot find a target) of in their pockets. MAde several pre-set-up things for the response team, including portable surgery equipment and a movable optable. Made autolathe items spawn on top of it. Added Death alarms, and made explosive implants work properly. Girders are now removed when a floor is made/RCD'd into existence. Internals can now be set even if it is in suit storage or on the belt. 2012-01-20 12:53:29 -07:00
Albert Iordache
f4a24a9804 Merge pull request #118 from SkyMarshal/master
Removed a lot of goonish flavor text, resprited emag and centcom id.
2011-12-18 03:03:04 -08:00
SkyMarshal
fda118e9ac Reworked emag again, new centcom id sprite, removed derpy flavor text. 2011-12-18 03:20:54 -07:00
Albert Iordache
1816be90a0 Merge pull request #117 from SkyMarshal/master
Again, check description.
2011-12-18 00:28:53 -08:00
SkyMarshal
fc3914364f Finished pepperspray, added mace item, improved security console, and a few other things. Will know when I see the diffs. 2011-12-18 00:23:02 -07:00
Tastyfish
a741413992 carve books, remove immovable rod/gr3y t1de 2011-12-17 20:46:42 -05:00
kortgstation@gmail.com
763c0ecf71 Can now make light tubes/bulbs in the autolathe
Old trashbag was buggy as fuck and useless. Didn't touch it's code, but replaced it's spawn in the janitors locker with a 20 slot, tiny item only storage object (new trashbag)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2577 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-30 05:35:40 +00:00
mport2004@gmail.com
17ed3899c4 Fixed the map/code issues that the body bags caused.
/obj/effects is now /obj/effect.
/obj/station_objects is now /obj/structure.
Did a bit of minor blob work. 
The Bay 12 body bags were replaced with closets because having two sets of code that do almost the same thing is silly.
Changed back a few of the last jobproc edits as the remove from list before assign was a check to see if the mob was fucked up and if it was remove it so we did not check it again as it would still be fucked up.
The medbay/tox monkeys names are random once more.  More random name monkeys will help with changeling and clean up the observe/mob menus.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2324 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-03 10:28:57 +00:00
petethegoat@gmail.com
344ea49cac There are boxes of bodybags in the morgue and the armoury. Maybe the janitor's job will become less insurmountable as a result. You can also label them with a pen.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2317 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-02 18:05:04 +00:00
mport2004@gmail.com
cf0023bbb2 You can now interact with belts that are not on your belt slot.
Added Security Belts, 4 slot belt that can carry basic sec gear.
The security shuttle control can now be emag'd.
Removed the old take off and stabilize verbs for the pshuttle. 
Cleaned up some computer defines.
The detective's cabinet is now a secure cabinet.
Most of the secure closets cleaned up a bit.
The captain no longer spawns with an ID box in his backpack.
RD's locker got its flash back.
Added the blob node sprites.
Removed the 2% laser resist that normal jumpsuits gave.  Normal clothing should not be blocking lasers.  Left the 10% special block on each department.
Riot suit slowdown lowered to 1 from 2.5
Repiped the right side of sec and tidied up the powerlines.
Loyalty Implanter moved into the outer rec room checkpoint.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2277 316c924e-a436-60f5-8080-3fe189b3f50e
2011-09-27 06:26:45 +00:00
kortgstation@gmail.com
451ebb2d75 Added a new cult themed backpack. Can be summoned with the cult equip rune (if your back slot is empty) and one starts in the Chaplains locker.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2228 316c924e-a436-60f5-8080-3fe189b3f50e
2011-09-19 06:12:37 +00:00
petethegoat@gmail.com
84d995a01d Made new sprites for light tube and glasses boxes. (Bulb boxes only have bulbs in them, tube boxes only have tubes.)
Removed some awful descriptions from items which should not have descriptions.
See: paper, empty boxes.

Fixed a bug which would cause traitor packs to have an emergency O2 tank and breath mask in them.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2201 316c924e-a436-60f5-8080-3fe189b3f50e
2011-09-14 15:21:45 +00:00
baloh.matevz
0173d96a30 Erro does a 180 flip by agreeing that there are too few firesuits!
- Added an extra fire closet to atmos, as there are 3 atmos techs
- Added a fire supplies rack to maintenance near mining
- Added a fire suit near EVA

- Added redcoat suit, hat and bandolier. (Damn it, some sources say it's spelled bandoleer, some say it's bandolier... Damn you English language!)

- Added this to changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2131 316c924e-a436-60f5-8080-3fe189b3f50e
2011-09-05 19:24:20 +00:00
mport2004@gmail.com
3cae06c9c3 Fixed the signpost shuttle bug.
Critters have been added and livestock removed
Xbow damage raised to 30 a shot
Centcom Survival Kit is once again a box
Sec uniforms moved into their own locker

After IRC talk
Guns that are created in the protolathe now spawn inside of a lockbox
They can be unlocked by an ID with Armory access or an Emag.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2045 316c924e-a436-60f5-8080-3fe189b3f50e
2011-08-24 04:00:45 +00:00
Superxpdude@gmail.com
29fa57a69a TRAITOR BUNDLES: Randomized boxes of 11-13 crystals worth traitor items, costs 10 telecrystals.
CHANGELOG UPDATED

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2020 316c924e-a436-60f5-8080-3fe189b3f50e
2011-08-16 18:23:42 +00:00
tronaldnwn@hotmail.com
3480b49706 Fixed the drinking glass box that had no sprite!
I made two alternative crates for the battery and engineering crates, they are named "Electrical Maintenance" and "Mechanical Maintenance".

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2003 316c924e-a436-60f5-8080-3fe189b3f50e
2011-08-10 04:36:38 +00:00
musketstgstation@gmail.com
e72cd0fdbd Fixed EMP area logging.
Fixed some incorrect messages associated with EMP grenades.
Unchecked an unused file.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1873 316c924e-a436-60f5-8080-3fe189b3f50e
2011-07-17 13:52:40 +00:00
Superxpdude@gmail.com
2c0dcca19f Syndicate Toolboxes are now slightly more robust.
Fixed a bug with CMO PDA spawning.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1842 316c924e-a436-60f5-8080-3fe189b3f50e
2011-07-13 02:33:52 +00:00
Superxpdude@gmail.com
9584b64a55 Alright, bunch of changes.
CODING CHANGES:
New Labcoats for scientists, geneticists, chemists and virologists.
Updated the labcoat buttons code to be easily expandable.
Changed the file path of the CMO's labcoat and the green because of the buttons change.
Added in a silenced pistol into the code, currently adminbus only.
SMG can now be constructed via RD. You're going to need a decent amount of materials and tech levels to make it though.

MAPPING CHANGES:
Virology and Toxins Storage have swapped locations.
Virology now has an airlock system at the front door. Hopefully we'll have less random outbreaks now!
Virology now has a wall safe.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1800 316c924e-a436-60f5-8080-3fe189b3f50e
2011-07-08 03:36:07 +00:00
baloh.matevz
f8f5ff2dc3 - yellow, blue, orange and red hardhats added
- the 'box' item no longer contains internals by default. A survival kit does tho.
- backpacks no longer contain a box, the backpacks which spawn as part of your kit at round start/late join contain a survival kit (box), which contains internals.
- engineers spawn with a different survival kit, which has an engineering em. oxy tank
- emergency oxy tanks now fit in boxes again
- engineering emergency oxygen tank (yellow) added (engineers spawn with it in their internals box), double emergency oxy tank added (not ingame yet), red and yellow oxygen tanks added (red spawns in firefighting closets, yellow is not ingame) (sprites by Aru)
- red hardhats spawn in fire closets
- CE spawns with white hardhat, one is also in his locker
- CE spawns with industrial backpack
- Pod people manual added to HOP's desk (he's the boss) and hydroponics
- Ore pile removed from code (was not used for anything and I don't want it to be)
- The mechanical and electrical toolbox in tool storage replaced with two tool closets. (We'll see if this works out)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1775 316c924e-a436-60f5-8080-3fe189b3f50e
2011-07-05 19:45:47 +00:00
baloh.matevz
c4ce2e965d Attack log now logs punches. Only when a human hits another human tho.
New glove colors: red, orange, purple, blue, green, gray, light brown, brown

New sprite for pirate and mime jumpsuit item

Satchel added as an alternative to the backpack, not in game yet

Sprites can be considered as WIP

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1765 316c924e-a436-60f5-8080-3fe189b3f50e
2011-07-04 22:16:30 +00:00
matty-1@talktalk.net
dfe4e68422 For my next trick, I shall do the following:
-Engineers and Miners will now start with an 'industrial backpack'.
-Added two new graffiti decals. Now with alpha channels!

that's it I think.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1761 316c924e-a436-60f5-8080-3fe189b3f50e
2011-07-04 14:50:46 +00:00
crazyclonetheninja
599f8174da A couple additions from Firecode:
*Tons more items now have descriptions.
*Jackboots now 20% less stupid.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1758 316c924e-a436-60f5-8080-3fe189b3f50e
2011-07-04 01:51:53 +00:00
Superxpdude@gmail.com
97726ff732 Syndicate Toolboxes now have their own sprites!
A few syndicate toolboxes placed on the map in various locations.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1718 316c924e-a436-60f5-8080-3fe189b3f50e
2011-06-24 05:24:03 +00:00
Superxpdude@gmail.com
5f1b51eba4 Added in a new syndicate toolbox.
Contains a welder, a wrench, a crowbar, wirecutters, a screwdriver, a multitool and some cable.
Syndicates can now acquire a syndicate toolbox for 1 telecrystal from their syndicate uplink.
Singularity beacon crystal cost upped to 8 crystals. It was way to Overpowered a 1.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1716 316c924e-a436-60f5-8080-3fe189b3f50e
2011-06-24 02:26:17 +00:00
baloh.matevz
b7c67f1df1 STORAGE ITEMS UPDATE:
- All code is now standardized. No more copy-pasted code for each item individually.
- It is now possible to edit the following things with variables alone (ingame too):
  - Storage slots number: Ingame HUD support for up to 21 items.
  - Max w_class: the maximum w_class of items that the storage item can hold. Note that it will not be able to hold storage items of the same size as it is to prevent the stacking of storage items in eachother.
  - Can hold: List of items that the item can hold (old)
  - Can't hold: List of items that the item specifically can't hold. (Use in the same way as can_hold, not used at the moment)
- Syringe boxes are no longer listed as first aid kits. I don't think this will affect anything but who knows.
- The HUD interface for storage items is slightly changed. It's just the X button is positioned one tile to the right of the bottom-right-most tile. This is needed for the correct expanding of the HUD.

I THINK I applied all the changes to these settings for all the items that used copy-pasted and slightly altered code. If there are any anomalies anywhere, let me know. If you find any special attackby() procs that still remain, delete them or tell me about them. Thanks.

Also: I checked to make sure first aid bots and floorbots are constructable.

Also: Listing myself as Game Master in the svn copy of admins.txt so I don't have to do it manually every time I do a fresh checkout. I need this to access the mapping helpers and since it doesn't cause any effects to the game, I don't see any potential problems with this.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1683 316c924e-a436-60f5-8080-3fe189b3f50e
2011-06-12 03:47:43 +00:00
baloh.matevz
54c3b3ad90 Cables now come in four colors: Red, yellow, green and blue. Engineer belts spawn with either red or yellow ones while electrical toolboxes spawn with any color. All three coils in a toolbox are the same color.
Also yes, yes, if you are really bothered by the fact that picking up a green wire piece with a blue coil will result in all of them being blue then that's fine, but I really think it's more than good enough for a game. It will also allow people who want to use a particular color the abbility to get enough wire pieces of it without unneeded problems.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1593 316c924e-a436-60f5-8080-3fe189b3f50e
2011-05-16 03:39:38 +00:00
baloh.matevz
69099b12c7 Dangercon 2011 - Medbay rebalancing
Code:
- White wardrobe now called white wardrobe instead of medical wardrobe, contains 5 white jumpsuits and 5 white shoes, 1 placed in genetics for people without clothes.
- Added patient's locker, works like personal lockers, contains 1x white jumpsuit, 1x white shoes (2 outside surgery, 1 in genetics)
- Syringe box no longer has the "(biohazard alert)" in it's name, it's moved to the description.
- Riot crates are once again orderable (unrelated bug fix)
- NanoMed dispensers now only contain 4 spaceacilin dispensers each, 1 more placed in the examination room, 1 in virology
- NanoMed dispensers now contain 4 beakers and 2 droppers
- Security officers no longer spawn with mime gloves in their backpack
- Medical locker now contains 2x inaproveline bottle, 2x antitox bottle, 1x syringe box, 2x dropper, 2x beaker. Removed supplies moved to tables and such.
- anesthetic lockers now contain 3x anesthetic tank and 3x breath mask
- Medical garb locker renamed to medical doctor's locker, contains a labcoat, white shoes, medical backpack, breath mask, medical cartridge, medical headset and medical belt.
- CMO locker now contains a cmo jumpsuit instead of a medical one and no longer contains the air tank
- Regular first aid now contains two kelotone pills instead of ointment
- Fire first aid kits now contain an additional 2 kelotone pills instead of ointment (they contain 4 pills, 2x inaproveline syringe and an analyzer)

Map:
GENETICS:
- Replaced empty closet with patient's closet which can be locked
- Replaced genetics wardrobe closet with white wardrobe closet
- Moved glasses box to clone room
- Added a 2nd diskette box

CMO Office
- Added an emergency closet for aesthetic reasons

MEDICAL STORAGE
- Placed 3x sleep toxin bottle on the table
- Placed 3x toxin bottle on the table
- Removed all first aid kits
- Placed glasses box on table
- Old garb locker is now a MD Locker

CHEMISTRY
- Doubled the supplies intended for grenade making so they can make 4 grenades now (once their construction is fixed that is)
- Added a third inaproveline bottle
- Removed kelotone pill bottle
- Added 2 empty pill bottles
- Added a second dropper

EXAMINATION ROOM
- Removed latex glove box
- Added inaproveline and antitox bottle on the table
- Added 2x inaproveline syringe on the table
- Added 1x spaceaciline syringe on another table
- Added a MD's locker (replaced closet)

SURGERY READY ROOM
- Replaced 2 closets with 2 patient's lockers
- Removed medical mask box.

MEDBAY LOBBY
- Now contains 2x fire first aid.
- Now contains 2x toxin first aid.
- Now contains 3x regular first aid.
- Contains 1 inaproveline, 1 antitox, 1 tox and 1 sleep tox bottle
- Contains a few inaproveline syringes, empty ones and boxed ones on tables around.
- Contains only one latex glove box and an extra set of gloves on a table
- Removed antitox pill bottle.

As with the r1490, please post any concerns or opinions you have. Try to be a bit more constructive this time. Generally if you were not able to keep score on what got removed and what got added, there is now less of all bottled medicine, but considering noone used the one that was locked away in medical lockers, it is not much more accessible and with that, more useful. There is the same number of medikits around, just placed in different areas and there is generally the same amount of stuff around, but it's easier to get to for non-medical personnel. The only serious nerf that I am aware of is the reduction of spaceacilin, but there are still 9 syringes in medbay, despite that. 

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1497 316c924e-a436-60f5-8080-3fe189b3f50e
2011-04-25 01:44:13 +00:00
baloh.matevz
a1cfe1bd7b Dangercon 2011 update:
- I agree that setting up as engineer is a pain, so engineers will now start out with a utility belt with everything from a mechanical toolbox in it (except for the analyzer) and a piece of wire in it. For the moment this spawns in their hand due to traitor assignment requiring the PDA to be in the belt slot.
- Engineers now also spawn with a hardhat on
- Hardhats removed from engineers lockers
- A hardhat has been placed on the rack with the fire suit for a HoP-assigned engineers.
- Utility belts on the racks reduced from 6 to 2
- Placed two empty syringes in hydroponics
- Deleted all blob spawns and placed them again in hopes that they actually cause some damage now...

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1492 316c924e-a436-60f5-8080-3fe189b3f50e
2011-04-23 19:08:19 +00:00
rastaf.zero@gmail.com
b58e465bbe Shitton of bugfixes related to bryteloss/fireloss.
Note for coders: in order to help with seaching of health-related bugs I have moved many procs from /mob/ under /mob/living/.
Also, done some clean up and rearranging.
Results:
-admin rejuvenating now works again;
-people screams if getting creamated while still alive;
-diseases actually loose your health;
-monkeys wearing masks receive protection from acids as humans did;
-and other minor fixes and improvements.
Bugfix for imbuing a talisman.
RD now spawns with only 2 pens instead of 3.
Audible emotions can be heard by people outside of locker/other container.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1446 316c924e-a436-60f5-8080-3fe189b3f50e
2011-04-15 07:41:19 +00:00
rastaf.zero@gmail.com
ad6a6e42aa Penlight fits in medical belt.
Fixed several runtime errors.
Monkeys and aliens won't stack dozens of blood stains.
Fixed crash in FEA code related to melting floors.
When screwdrived destructive analyzer unlink from RD console protolate instead of itself.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1443 316c924e-a436-60f5-8080-3fe189b3f50e
2011-04-14 03:52:09 +00:00
tronaldnwn@hotmail.com
95f30cf5b8 Ahem...
Glasses: 
Added Optical Material Scanner - A gimmicky item that lets people see ALL OBJCECTS, even if hidden by turf.

Storage:
Added dice pack - one d6, one d20 (will add more once I add more Dice types).

Toys:
Typo fixes.

Cigarette lighters:
Zippo - Made the lighting message gender neutral.
Match - Made the lighting message gender neutral.

RSF:
Provides new items - Dice packs, pens, and cigarettes

Human life:
Made the Optical material scanners work to see objects.

Robot Modules:
Servicce borg - Has a lighter now (which will be modified soon so people can light other people's cigarettes).

Icons:
Night vision goggles slightly modifies to have a space for the nose of humans to stick out.  The item state changed a bit out of the place holder status.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1386 316c924e-a436-60f5-8080-3fe189b3f50e
2011-04-05 22:53:46 +00:00
tronaldnwn@hotmail.com
1c8a3539c4 Sprite updates:
Miner Cyborg looks better.
Better jackhammer (I like it at least).
New sink for kitchen
Few sprite fixes for the emergency oxygen tanks
Cyborg's RED eyes, will not work now.


Code Stuffs:
Adding some code for mining so I can eventually make the top tier mining items work for radius mining.
Showers are in their begining stages.
Tool boxes give weapons research bonus, of 1 (lol, tool boxers).

Map Stuffs:
Added a few more hazard signs.
Added enclose the engine (still airless).
Kitchen has new sink.
I desided the dispencer should be a water dispencer in the mine station.
Barely worked on the wizard's lair, just added lights I guess.
More colored clothing lockers in locker room/ arrivals shuttle. Now expect to see green wearing assitants.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1315 316c924e-a436-60f5-8080-3fe189b3f50e
2011-03-31 02:01:47 +00:00