Commit Graph

2220 Commits

Author SHA1 Message Date
Kilakk
133a06ddc4 Gave fax machines on the map their "department" variables 2013-10-26 13:29:07 -04:00
fauxki
66757d0650 * Should fix bar shutters not working.
* Switches floor tiles in beach holodeck because the water effect wasn't working correctly.
2013-10-22 17:58:54 -07:00
Segrain
9a662594f2 Cash money. 2013-10-21 05:04:45 +03:00
Segrain
088ff405a6 Proper mapmerge. 2013-10-21 04:44:15 +03:00
Chinsky
55ea60a785 Fixed derpy type of psych couch 2013-10-16 12:50:40 +04:00
Segrain
81cf97c105 New sprite. 2013-10-11 12:43:22 +03:00
Segrain
1127e9d8ac Postmerge mapfix. 2013-10-11 12:30:30 +03:00
fauxki
8005e25a24 * Adds the APCs I forgot to add to the dorm rooms.
* Rezones Medbay for Light Switch Usage. - Surgery Observation and Operating Room now relabeled as Surgical Ward. Each Patient Room and Psych Office also now separate areas.
* Went around and looked for places missing light switches and added them in.
* Edited the beach holodeck a little more and added a flotation device to it. Super Pretty now!
* Removes shutters from coffin area of chapel because ugly, replaced with privacy shutters. Still ugly, but now there's privacy.
2013-10-05 08:29:35 -07:00
fauxki
b932ffb0de fixes an error that i had with the map while i was trying to resolve some conflicts. 2013-10-04 12:38:02 -07:00
fauxki
ff6f2dfe95 Merge branch 'dev' of https://github.com/fauxki/Baystation12 into dev
Conflicts:
	maps/tgstation2.dmm
2013-10-04 12:04:53 -07:00
fauxki
37efcdf736 * Removed Shutters from Interior Windows. ( http://baystation12.net/forums/viewtopic.php?f=20&t=8787 )
* Removed Shutters from Bar and replaced with Different Shutters. Because was Ugly. (hopefully the button works).
* Added in Security Wing Dorms. ( http://baystation12.net/forums/viewtopic.php?f=20&t=8829 )
* Made Modifications to Zoning in Dorms. (allows for better crew sensors and for the light switches to work).
* Slight adjustments to escape wing. (hopefully better areas for engineering to put shielding, i don't know how those things work).
* Added Long Term Mass Quarantine Zone to virology.
* Changes to Map at Beach Holodeck and Pool.
2013-10-04 02:53:18 -07:00
Mloc
49c0a30301 Merge branch 'master' into dev
Conflicts:
	baystation12.dme
	html/changelog.html
2013-09-26 10:26:03 +01:00
Mloc-Argent
e9bf414820 Refactors code to work with BYOND 500.
500 adds a "color" var to /atom, which conflicts with /obj/item/color, /obj/atmospherics/color and various simple_animals.
  /obj/item/color is now item_color
  /obj/atmospherics/color is now pipe_color
  simple_animals color is now body_color
Removes transformer.dm since it conflicted with transform() and was never used.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-09-22 12:39:48 +01:00
fauxki
019f54d1d7 Map changes.
* Removed all the shutters from interior windows, they should remain on the exterior ones that lead to space. Please notify me if I missed some.
* Removed shutters from all maintenance tunnel areas. There's no way to activate these anyways, so they are rather pointless.
* Removed shutters from plastic flaps. Plastic flaps already block air. :|
* Added Security Wing Dorm to replace the abandoned detective's office.
* Changed the sheets in the dorms.
* Modified dorm rooms into seperate areas, Dorm One, Dorm Two, Cabin One, Cabin Two. This is so that the light switches work for the specific rooms.
* Modified the escape wing slightly to allow space for a shield generator, so hopefully engineers won't have to break glass in order to put those up anymore.
2013-09-21 03:17:38 -07:00
meyar
7a800d749a Fix 2013-09-19 18:15:47 -04:00
meyar
119de49f60 Adds a missing suit modifier to EVA 2013-09-19 18:13:23 -04:00
Kilakk
f1a3ee05ca Put the fax machines on top of tables on the map 2013-09-18 20:14:05 -04:00
Segrain
c055f722dd Localised implant detection. 2013-09-14 23:50:31 +03:00
Segrain
bf5fde832e Proper mapmerge. 2013-09-14 23:01:00 +03:00
Segrain
d13f9e617b Fix for #3666. 2013-09-13 19:38:21 +03:00
Segrain
6b5b28bc0b Fix for #3655. 2013-09-13 19:30:48 +03:00
Zuhayr
e68b284213 Variant hardsuit placement on the map. 2013-09-10 00:18:33 -07:00
Erthilo
74c19d4ec8 Added vacuum flask to bar. 2013-09-01 13:24:13 +01:00
Erthilo
069a9bf6a4 Adds more flashlights to the brig. 2013-09-01 00:39:06 +01:00
Erthilo
f31185e052 Robot Analyzer. Health analyzer for robots. 2013-09-01 00:15:47 +01:00
Erthilo
961ebcec35 Added Megaphones to all Heads offices. 2013-08-31 22:14:31 +01:00
Erthilo
547c1e670d Adds janitorial cart from tg, replacing janicart. Adds in some NanoUI stuff to make it work. 2013-08-31 20:12:19 +01:00
Erthilo
2774abe653 Fixed ID tag on prison door, issue #3597. 2013-08-28 01:10:14 +01:00
Erthilo
a229582187 Added IA stamps, IA office has a receiving desk. 2013-08-27 22:10:20 +01:00
Zuhayr
d3c7628140 Added fancy hat to fixed vox shuttle. 2013-08-25 15:24:16 -07:00
Segrain
1e3bc659d5 Vox skipjack fix. 2013-08-25 08:13:40 +03:00
Zuhayr
10183ed170 Expanded Vox shuttle, adjusted loadouts, added shutters, added basic preliminary hardware for cycling airlocks. 2013-08-25 02:09:31 -07:00
Segrain
f1f6c07ded Same mapfix, part 2. Also, minor update. 2013-08-24 09:35:14 +03:00
Segrain
44b5ed8fd3 Same mapfix, part 1. 2013-08-24 09:27:41 +03:00
meyar
63cf0cb303 Adds a pair of fire lockers to the Emergency Closets.
Adds some missing hazard doors missed during the first pass.
2013-08-23 20:38:45 -04:00
meyar
15fbe7a233 Loadsachanges.
Adds hazard doors to most(Should be all) windows. May be some issues, I had to add a /lot/ of doors. report issues.
Removed the SAW from the ERT area pending a remap.
Replaced the mechs in the ERT area with different mechs, requires admin permission to get to. (Launch platform is disabled I believe)
Fixed the warden's news caster, can now properly set wanted posters.
2013-08-19 14:08:23 -04:00
Kilakk
4b04ff7571 Added a few fax machines to the map
* Cap's office, IA office, headstaff meeting room
2013-08-18 15:02:57 -04:00
Mloc-Argent
e809be825e Merge branch 'master' into dev
Conflicts:
	code/modules/mob/say.dm
2013-08-16 22:22:42 +01:00
Segrain
5ec3524a89 Lost-in-merge fix, again. 2013-08-17 00:24:39 +03:00
Segrain
3722bf97df Postmerge mapfixes again. 2013-08-15 21:03:14 +03:00
Mloc-Argent
1e980a9cc1 Merge branch 'master' into dev 2013-08-15 15:29:53 +01:00
Mloc
d3a44d9855 Merge branch 'master' of github.com:Baystation12/Baystation12 2013-08-15 01:04:45 +01:00
Mloc
ff1f90dd38 Cleanup of maps folder.
Removed every excess map, leaving only tgstation2.dmm, formerly tgstation.2.1.0.0.1.dmm.

Signed-off-by: Mloc <colmohici@gmail.com>
2013-08-15 01:02:16 +01:00
Jamini
339701e97a Actually put in the atmos closets
Signed-off-by: Jamini <mobiousjami@gmail.com>
2013-08-13 19:03:39 -04:00
Jamini
f05c44dc23 Praying this works
Added Lockable lockers for atmos techs
Adjusted equipment in lockers
Adjusted wardrobe lockers
Added Engineering berets
Rearranged equipment in engineering

Signed-off-by: Jamini <mobiousjami@gmail.com>
2013-08-13 18:57:08 -04:00
meyar
f8f5dd39bd Fixes the button-less Permbrig flasher, adds the missing intercom to interrogation. Fixes an atmos closet with pipe problems next to security. 2013-08-13 11:28:42 -04:00
Mloc
71b962b187 Merge pull request #3492 from Erthilo/master
Fixed a sink in the kitcken turning into an airlock.
2013-08-12 05:56:59 -07:00
Mloc
59821a2174 examples for fileList.txt 2013-08-12 13:55:54 +01:00
Erthilo
04ba916a81 Fixes sink turning into an airlock in the kitchen. 2013-08-12 13:55:30 +01:00
Zuhayr
b57430c4ee Added nitrogen tanks for pressure cannons. 2013-08-08 19:26:56 -07:00