Commit Graph

2676 Commits

Author SHA1 Message Date
Zuhayr 3192323c19 Fixes #3200 2013-06-29 16:57:08 -07:00
Segrain 29903c46e3 Quickfix for multitile doors. 2013-06-25 11:40:01 +03:00
SkyMarshal aa85e757d4 Added a better framework for multi-tile doors, pulling works strangely though. 2013-06-24 17:21:55 -07:00
Segrain 7fec5309f7 Airlock construction update. 2013-06-23 20:42:58 +03:00
Segrain dcf984577a Adding construction of req_one_access doors. 2013-06-18 02:47:24 +03:00
Segrain 91e1e848f7 Bugfixes for windoor construction. 2013-06-18 02:34:15 +03:00
Asanadas 7479fd272c Added Malsquando's colored suit to the hop's wardrobe locker.
Everything should be working correctly.
2013-06-13 09:41:52 -04:00
Chinsky bb26c5a7cb Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into newstuff
Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
2013-06-12 23:11:28 +04:00
Vetinari 3c0a424bb3 Medbay Remap post-ERT
Medbay Overhaul, mapping post-ERT changes, recommit of previous files
due to computer derp.
2013-06-12 23:27:36 +10:00
Chinsky 6dc2d9d2dc Merge pull request #3015 from comma/master
Fix
2013-06-10 11:50:50 -07:00
Chinsky eaf6b64277 Compile fix. 2013-06-09 19:53:08 +04:00
Chinsky 4118d183c1 No fun allowed.
Fixes some hilarious stool glitches.
2013-06-08 05:27:32 +04:00
MisterBook eab6f4fc44 Taser fix v.3.2
Now accounts for multiple layers of armor.

I've also commented out Vox stuff, while Zuhayr fixes it. Because, no compile.

I also fixed whistle.dm
2013-06-05 19:37:29 -05:00
Chinsky 211fc25f0d Should probably slap it here, OR ELSE. 2013-06-05 21:58:27 +04:00
Chinsky cfbc3e5352 Added webbing and vests to lockers. 2013-06-05 21:35:56 +04:00
Zuhayr 9e71180e1b Merge conflict resolution, using BEF. 2013-06-05 14:22:04 +09:30
Chinsky abc2e6b96b Merge pull request #2903 from fauxki/bleeding-edge-freeze
DON'T MERGE - BEF - Bar / Holodeck / Theatre / Hydroponics Revamp
2013-06-03 01:59:33 -07:00
Segrain 3d41e24664 Minor tweaks to spawning medical clothes. 2013-06-02 23:01:33 +03:00
Chinsky 63f9549596 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into whistle
Conflicts:
	baystation12.dme
2013-06-01 17:12:51 +04:00
Chinsky 6de8060545 Added hailers to the Sec closets. 2013-06-01 08:34:31 +04:00
fauxtada f367d7de19 Bar / Holodeck / Theatre / Hydroponics Revamp
- http://baystation12.net/forums/viewtopic.php?f=20&t=7692
- Added six new fields to the holodeck. Theatre, Meeting Hall, Picnic Area, Snow Field, Space Walk, and Desert.
- Added a Hydroponics Pasture that houses animals for botany. The Chef and Botanists have access to this area.
- Theatre was removed from the bar, replaced with bar. Chef was given an area to lay food out on, and more tables were added for sitting at. Had to move some disposal pipes around and the nav beacons. *crosses fingers* They probably work?
- Removed dispatcher uniform from closet, since it is being used as a general replacement security uniform. And that made Chinsky mad...
- Fixed airless tiles under airlocks.
- Replaced duplicate medical records computer behind medbay desk with Nanomed Plus.
- Pun Pun now has a different monkey sprite from the rest.
2013-05-29 20:24:29 -07:00
VitrescentTortoise 2b689fa3f0 Gave nuke agents magboots. 2013-05-28 21:34:26 -07: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 1b0c6b942a NOW IT COMPILES.
Incomplete rename.
2013-05-21 18:08:28 +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
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
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
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
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
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
Uristqwerty 6a66f542d9 Update from early tubes with bugs, to tubes with less bugs and more features based on feedback. 2013-03-20 18:49:14 -04:00
Cael_Aislinn 42d8cd33e0 made fuel injectors and core gens properly start in mobile configs, made large crates able to hold 1 large item (machinery or structure)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-16 20:58:31 +10:00
Cael_Aislinn 06476113fa add the beekeeping manual to hydroponics, add a beenet to the hydro lockers
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-09 23:48:31 +10:00
Christian Bielert c31abc3b05 Merge pull request #2502 from comma/gunmode
Aiming Mode
2013-03-09 00:13:19 -08:00
Chinsky 55671d7485 Merge branch 'guntest' of https://github.com/Whitellama/Baystation12 into gunmode
Conflicts:
	code/modules/mob/living/simple_animal/simple_animal.dm
	icons/mob/screen1_old.dmi
2013-03-06 17:04:45 +04:00
Cael_Aislinn ae2b667f38 fixed icon issues with large crates, added a reinforced large secure crate (different aesthetically)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-06 21:18:15 +10:00
Cael_Aislinn efd586a9e1 added large metal crates (secure and normal variants) to be resprites of normal crates
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-06 01:32:28 +10:00