Commit Graph

2711 Commits

Author SHA1 Message Date
Segrain 3409e1f05d Toolbelts can hold engineering tape. 2013-05-30 19:35:03 +03:00
Segrain 50f05f7a11 Pill bottles can hold paper.
For prescriptions and such.
2013-05-30 19:28:34 +03:00
cib cab1289511 Merge branch 'master' of github.com:Baystation12/Baystation12
Conflicts:
	html/changelog.html
2013-05-26 20:43:22 +02:00
meyar 1d5d7cb901 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-05-24 06:52:03 -04:00
meyar c1e701f32b Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12
Conflicts:
	maps/tgstation.2.1.0.0.1.dmm
2013-05-24 05:23:36 -04:00
Kilakk ef2c7af6a0 Telescopic baton message fix.
Fixed first- and third- person extend/collapse messages for the
telescopic baton, woo
2013-05-23 16:24:53 -04:00
cib b5217d862a A few fixes to rp-rev
- Name was empty, hopefully using real_name fixes that
- Announcements coming too quickly
- Fixed icon path issue
2013-05-23 22:12:20 +02:00
cib ce19719700 Fixed two problem with airlock/APC commit:
- Debugger now sends messages to user instead of usr(whoops)
- Can now close emagged door with crowbar so you can take out circuit
- Couldn't weld emagged doors
- Replacing the circuitry should now be sufficient to fix an emagged door.
2013-05-23 19:47:33 +02:00
cib aa6bfc33c7 Airlock and APC changes.
- Added a debugger device that can figure out when an object has been hacked/emagged
- Hacked APCs no longer display blue screen
- You can now disassemble emagged airlocks, they will yield a fried airlock electronic.
2013-05-23 16:43:29 +02:00
Chinsky bdb16b1f99 Renamed bruise pack back to gauze.
STAY LIKE THAT.
2013-05-22 14:05:53 +04:00
Chinsky 1b0c6b942a NOW IT COMPILES.
Incomplete rename.
2013-05-21 18:08:28 +04:00
meyar ebe2e26ed3 Fixes the Syndicate nuke shuttle airlock (In that it cycles now)
Re-added external airlock access to the traitor ID card, restoring lost functionality.
Fixed the ERT radio. It now works.
2013-05-19 05:00:06 -04:00
cib f5b0b52b6c Added stasis bag.
This stops all life functions of a patient for a while. It can only be used once, and inflicts low amounts of brain and clone damage over time.
2013-05-19 07:48:43 +02:00
Chinsky 6c062dc05c Merge pull request #2793 from meyar/master
Fixin' the traitor ID
2013-05-18 06:11:46 -07:00
faux 6e85a3ed42 Master Bug Fixes
- Fixes wall under maintenance tunnel door.
- Fixes AAAAHHHHHHHRRG psych office pressure issue.
- Fixes some names and DMIs on some items. (in theory)
2013-05-18 05:57:21 -07:00
meyar c170f57ba7 Returns lost functionality to the traitor ID, letting a traitor re-forge their ID more than once. 2013-05-18 06:48:01 -04:00
Mloc 5faabba7fb Merge branch 'master' into bleeding-edge-freeze
Conflicts:
	html/changelog.html

Signed-off-by: Mloc <colmohici@gmail.com>
2013-05-16 12:21:55 +01:00
fauxtada 2b9130b00f Quick Fixes
- Changed access to security washroom so detective can go in.
- Removed wall that was under maintence tunnel door.
- Fixed writerer's custom item. AGAIN. .. Because they can't decide what character they want it on.
- Added saloon dress to bar closet.
2013-05-15 11:26:26 -07:00
Cael_Aislinn 749d3eeaa0 transit pods should reverse direction when they reach the end of the tube
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-05-14 13:10:28 +10:00
fauxtada 5b2f03db10 Map Fixes - BEF
- adjusts the piping and flooring panels in the new security wing.
- fixes the piping around the new eva since they lead to nowhere.
- adjusted the medbay lobby a bit, added a second chair behind the front desk.
- added in a xenos closet. has unathi items / wooden sandals in it currently. still need to sprite up the tajaran and skrell items.
2013-05-11 09:33:45 -07:00
Mloc-Argent 849ec5052a Fix for compiling on case sensitive filesystems.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-05-06 16:09:10 +01:00
Mloc-Argent 27759f47df Merged master into BEF.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-05-06 15:43:50 +01:00
fauxtada cdb3466cd9 may or may not fix issue of missing sprite for captain's uniform jacket. 2013-05-02 03:19:23 -07:00
fauxtada fed2bfcedc fixed michael guess' zippo, added therapy doll dmis to code, the items aren't coded because i cannot get it to work for the life of me. 2013-05-02 02:00:04 -07:00
Spamcat ef368a6756 Returned Lamarr.
... which can be used as internals. Shh, let it be our secret...
#2583
2013-04-30 16:59:38 +04:00
Spamcat 0acd40326f Increased pill bottle capacity to 14 pills (2 rows).
Also fixed #2714.
2013-04-30 15:44:31 +04:00
fauxtada e384c90093 minor changes
- Fixed accesses to security office doors.
- Added a second HoP closet for attire purposes. Armor and guns in one closet - fancy clothes in the second one.
- Fixed Writerer's custom item thing. Was attached to wrong character.
2013-04-30 02:37:43 -07:00
jediluke69 e256f2d095 should nerf nanopaste 2013-04-24 19:42:19 -04:00
fauxtada c1991ba0dd Player Requests Edition
- Two canes will spawn in medbay storage for people with leg injuries.
- Added some more welding goggles for engineers in engineering.
- Armory has a second security hardsuit.
- CMO has hallway access to the medbay hardsuits.
- HoS hat spawns in HoS closet.
- White wedding dress spawns in chaplain closet.
- Removed Pulse Rifle and Laser Canon from ERT room.
- Detective's office will now start off with a cigeratte pack and a detective's flask.
- Three normal boring flasks now spawn behind the bar for the bartender to give out.
- Old Man Suit spawns in laundry room. - Requested by Book.
- Roaper's Callum suit ( http://baystation12.net/forums/viewtopic.php?f=33&t=7047 ) now spawns in under Knockoff Suit. It may or may not spawn in for him too, I don't know how this shit works but I think I got it right.
- Removed Roaper's items for Ian Colm. At least the code part, I don't know if I'm supposed to delete the DMIs or not so I left them in.
2013-04-24 03:04:35 -07:00
Chinsky 47b28e5cce Merge pull request #2690 from fauxki/bleeding-edge-freeze
Bleeding edge freeze - Map / Clothing changes
2013-04-23 16:15:05 -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
fauxtada 272d7925cf Sorry, sorry!
The last commit was full of compiling errors, this fixes that one.
2013-04-22 13:29:23 -07:00
fauxtada 44a67167b3 Uniform Closet Changes
- Adjusted the items that spawn in the mixed wardrobe. Now includes:
--- Colorful shoes.
--- Plaid Skirts. Lady Power.
--- Leather shoes.
- Put dispatcher uniform in security closet for playtesting purposes.
- Nurse dress, orderly uniform, and first responder jacket now spawn in medical closet. Man that thing is full of stuff.
2013-04-21 22:50:52 -07:00
SkyMarshal b0d1d47c23 Fixes lighting, backpacks getting contaminated, and bombs not working. 2013-04-18 09:58:37 -07:00
SkyMarshal 710e97bcc6 fuel is now a bit less derpy. Napalm produces volatile fuel, and less of it. Fire consumes more welding fuel. 2013-04-18 09:56:52 -07:00
Ravensdale 2f6fdf556d final tweak for cap's PDA to do as advertised. 2013-04-18 09:56:51 -07:00
Ravensdale cda1248be7 Bugfix: Adds in a check to make sure atmos code has been loaded before trying to generate, preventing some runtimes.
Tweak: Removes captain's armour from spawn code.

Tweak: Captain's PDA now spawns with messenger on but is now undetonateable.
2013-04-18 09:56:50 -07:00
SkyMarshal f05b8e0083 Fixes issues:
#2632 Fire Issues (Fire doors work, Flamethrower reverted to making a flamethrower liquid fuel subtype, flame grenades now make a puddle of welder fuel that is lit aflame with napalm)
#2630 (The code has been calling (turf).temperature_expose when it was supposed to be hotspot_expose), #1865 (aqain)(Added a check to remove trace gas fuel under a certain point).
Also: added a flashpoint value for plasma, which is the temperature at which it self-ignites (Currently 246C or 519K which is equal to gasoline)
Partial-tile firedoors now default to full-tile firedoors as the part-tile ones were breaking ZAS zones entirely.  Possible cause of #2627 and maybe #2451, but those need tested and I did not have time.
2013-04-18 09:56:49 -07:00
Albert Iordache fdadc08414 Merge pull request #2670 from SkyMarshal/master
Fixes lighting, Backpacks getting contaminated, and bombs not working.
2013-04-17 22:15:10 -07:00
SkyMarshal 698e7af57c Fixes lighting, backpacks getting contaminated, and bombs not working. 2013-04-17 22:07:41 -07:00
fauxtada 3fa1314c01 Fancy Formal Wear Overhaul
- Adds female dress unforms to Captains, RD, and HoP's closets.
- Fixes up the bride's dresses so they are working when spawned.
- Fixed Wedding Branch. - five wedding dresses.
- Added Dress Branch. - twelve dresses - that's including dresses moved over from the wedding branch.
2013-04-17 22:03:38 -07:00
fauxtada 0d2598c55a Adds female swimsuits to the atheltics closet. In theory. So no more certain female players running around the beach with their titties hanging out... In theory. 2013-04-17 18:22:15 -07:00
fauxtada 98a8ebab4b Added Captain's Jacket to the Captain's Closet. Chinsky showed me how to do this, so I don't know how well it was done. 2013-04-17 17:02:48 -07:00
Ravensdale 313dc5e7c0 Merge branch 'master' of https://github.com/Baystation12/Baystation12
Conflicts:
	code/game/jobs/job/captain.dm
2013-04-17 08:47:49 -07:00
Spamcat e40ff1bfc4 No need for dis shit. 2013-04-17 14:21:44 +04:00
Ravensdale 09212483bc final tweak for cap's PDA to do as advertised. 2013-04-16 08:47:23 -07:00
Ravensdale 19c7c8d651 Bugfix: Adds in a check to make sure atmos code has been loaded before trying to generate, preventing some runtimes.
Tweak: Removes captain's armour from spawn code.

Tweak: Captain's PDA now spawns with messenger on but is now undetonateable.
2013-04-16 08:43:19 -07:00
Spamcat 44401cf03e Fixed blood overlays for batons. Also,changelog. 2013-04-15 22:23:09 +04:00
Spamcat d8f825894a Telescopic baton, biatch. Bastard child of baton and energy sword.
Added one in HoS's locker.
2013-04-15 02:47:48 +04:00
SkyMarshal 221901ba3a fuel is now a bit less derpy. Napalm produces volatile fuel, and less of it. Fire consumes more welding fuel. 2013-04-11 12:14:47 -07:00