Commit Graph

3906 Commits

Author SHA1 Message Date
SinTwo
2d7d011d9e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into frame_fix
Conflicts:
	maps/polaris-1.dmm
	maps/polaris-5.dmm
2016-06-01 14:47:21 -04:00
SinTwo
5d25d72593 Frame Fixes 2016-06-01 14:32:56 -04:00
Datraen
b2304d6804 Fixes bugs with current map (#1833) 2016-05-31 23:52:53 +01:00
Datraen
c75512aa75 Xenobio2 Update #3 (#1832)
* Adds growth inspection to the trait scanner, lowers mutation and growth levels.

* Adds NutriMaxes to Xenobiology, for feeding the slimes.

* Fixes a typo
2016-05-31 18:30:52 +01:00
Datraen
d19614dee3 Updates map. 2016-05-30 23:51:07 -04:00
Datraen
5decb131d2 Updates Map
Chemical Dispenser added to the lab for easy access to chemicals without having to run to the anomaly chem lab.
Moves biological genetic bombarders to the center of cells, to prevent any overlapping from occuring with the map and the bombarders.
2016-05-28 20:08:31 -04:00
EmperorJon
01b3182004 Merge pull request #1462 from Datraen/Xenobiology_2
Xenobio2
2016-05-28 21:32:18 +01:00
Datraen
a4e2b803f5 Adds a map http://i.imgur.com/ZI1gKc1.png
Also updates slime storage to handle all xenobio products.
Also adds a missing component_parts = list().
2016-05-28 15:01:22 -04:00
Anewbe
1d3a57cd76 Pathing Tweaks (#1719)
* Edits some pathing references

* Cleans up a spacing thing

* Map thing

* Adds the \improper tag to NT breacher gear, for improved grammar
2016-05-28 17:17:41 +01:00
Woodratt
eab5b75977 1.5.2 Woodrat Breaks the map (#1774)
- Major changes to the civilian areas. Rooms such as the vault have been moved elsewhere on station.
- Communal Dorm near cryo removed as they were never used.
- Fixed Space tiles in windows next to robotics.
- Fixed Chargers in Robotics.
- Small bug fixes such as camera in the CE office name.

This should mean the map hold will be no longer in effect when merged.
2016-05-28 14:25:10 +01:00
Neerti
4656db4aa9 Adds PDA Multicaster
Adds a new machine to telecomms, which contains special PDAs corresponding to each department on the station.  Sending a PDA message to one of these PDAs will duplicate it to everyone in the department the PDA is assigned to.  It determines what department someone is in by cartridge type.
Adds cartridges for several jobs that were missing them, for the purposes of being recognized as being in a department.  The cartridges otherwise do nothing.
New circuitboard to build the new pda multicaster.  It can also be deconstructed with the standard machinery deconstruction steps of screwdriver > crowbar.
2016-05-12 02:50:35 -04:00
Datraen
67ab2e3509 Merge pull request #1574 from Yoshax/mapfix
Fixes a missing wire in research
2016-05-06 18:47:14 -04:00
Datraen
5cc027aacf Merge pull request #1536 from Yoshax/roboticsandcells
Remaps robotics and mechbay slightly, other adjusts and adjusts cell charge rate
2016-05-06 18:46:53 -04:00
Yoshax
6e87af4af9 Fixes a missing wire in research 2016-05-06 22:16:47 +01:00
Yoshax
47508187cc Makes smoke grenades last longer and adjusts checks
- Changes boxes of smokes from 5 to 7 grenades
- Changes mapped in single smoke grenades to boxes
2016-05-06 17:25:28 +01:00
Mark9013100
2e1a9d56e5 Adds two missing decals to Z-2 2016-05-05 11:17:56 -04:00
Yoshax
80caae01b6 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into roboticsandcells 2016-05-04 18:50:40 +01:00
Mark9013100
4f1fd6590d Z-2 edits, 5/4/2016 (#1546) 2016-05-04 13:45:38 -04:00
Yoshax
42c8a51911 FIxes incorrect shutters 2016-05-04 18:39:56 +01:00
Datraen
7f6e2fb8de Merge pull request #1516 from Yoshax/mapqol
Map QOL changes
2016-05-04 10:38:47 -04:00
Yoshax
023216389e Changes tinted windows in robotics to normal; Removes tweaked medical console; Replaces with normal medical records console; Changes access console access requirement to include robotics. 2016-05-03 23:11:14 +01:00
SinTwo
5ae20ceb8b Buildables v1.2 (#1517)
* Removes text2path, adds constructability to a few things, adds a locker_painter.dm, and several fixes.

* Fixes Maps due to working on ancient versions.

* Path error.

* Adds a missing ..()
2016-05-03 22:18:12 +01:00
Yoshax
8263c73162 Actually fixes area and adds latex gloves 2016-05-02 19:57:13 +01:00
Yoshax
763e4d247b Corrects area error 2016-05-02 19:40:59 +01:00
Yoshax
af8dcac262 Remaps robotics and mechbay slightly, other adjusts and adjusts cell charger power usage to up charge rate 2016-05-02 19:16:06 +01:00
Yoshax
e7d01f1393 Attempts to re-add the mysterious vanishing sinks + removes crowbars from spawn points and replaces where appropriate with lockers & emergency toolboxes 2016-05-01 14:12:48 +01:00
Anewbe
22a9b32a29 Fixed the map thing and a few other issues. 2016-04-29 19:08:04 -05:00
Yoshax
227f6601f4 Map QOL changes 2016-04-29 18:04:50 +01:00
Yoshax
4b0c6e7738 Fixes map locker 2016-04-28 21:44:38 +01:00
Yoshax
f80d9efdb4 Adjusts HoS' locker capacity & moves CE's office camera 2016-04-28 18:10:10 +01:00
Datraen
32c27d3fa0 Merge pull request #1456 from Yoshax/maintenancechanges
Adds more flavor to maintenance
2016-04-27 11:01:40 -04:00
Yoshax
fa6f73f3a7 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into areafix 2016-04-21 17:10:42 +01:00
Yoshax
04e9449106 Fixes merc base area 2016-04-21 16:39:47 +01:00
Mark9013100
3c5fb70830 Map edits, 4/21/2016 2016-04-21 05:41:01 -04:00
Yoshax
cc931bc509 Fixes an area 2016-04-20 22:40:37 +01:00
Yoshax
e42f64093d Adds more flavor to maintenance 2016-04-20 22:16:22 +01:00
Yoshax
6bde95c3b7 Merc changes
Adds:
-Megaphones
-Flares
-Maglights
-Binoculars
-Station bounced radios
-Cameras + film
-Adjusts surgery room
-Gives rollerbeds
-Removes blast door computer, adds buttons
2016-04-16 17:33:19 +01:00
Datraen
2e2bde918d Merge pull request #1362 from Kelenius/pleaseSwitchMeOn
Solars start wired
2016-04-15 11:21:00 -04:00
Datraen
61a9684bfb Puts more air in the pump station tanks. 2016-04-08 14:18:04 -04:00
Kelenius
90a79df9f8 Solars start wired 2016-04-07 12:27:48 +03:00
Datraen
e1c0256477 Brings the jumpsuits, pants, shorts, ponchos and hoodies under the path system. 2016-04-05 14:44:31 -04:00
Datraen
ca24446d7f Merge pull request #1287 from Kelenius/unitTests
Ports unit tests
2016-04-04 10:34:12 -04:00
Datraen
54627608e1 Adds a portables pump station to the station.
* Adds a pump station to the station.

* Adds a digital valve for switching between the canisters and the waste loop.
2016-04-04 04:12:35 -04:00
woodratt
1f3556316d 1.4.9 Hotfix
- Phoron tank in atmos brought back into OSHA non-compliance
- Extra table in the starboard aid station removed.
- Missing air alarms in visitor rooms added.
- Derelict shop area updated.
- Manhack grenade fixed for heist.
- Two of the three spike throwers removed.
- Three new "hair" styles added for Teshari, fixed one broken one.
- Toxins mixing chamber now starts airless.
- Framework in place to allow for a custom item (white cane)
- Fixed access restrictions on riot control maintenance door.
- Firelock added to CE's office door. Entryway from the CE's office to the monitoring room added.
- Fixed a camera in the detective's office.
- Anchored the exonet node on T-comms.
- Fixed Dufflebag in hand sprites.
2016-04-02 15:44:37 -07:00
Datraen
459f70ba46 Merge pull request #1319 from Mark9013100/3/31/2016medweb
Adds the medical webbing
2016-04-01 16:53:58 -04:00
Mark9013100
f51a350281 Adds the medical webbing 2016-04-01 08:11:23 -04:00
Mark9013100
d637e6bc8e Janitor Edits 2016-04-01 04:55:39 -04:00
Yoshax
873b2ef36b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into map2fixes 2016-03-31 16:07:34 +01:00
Mark9013100
50a6f53c12 Map fixes, minor edits 2016-03-29 10:50:22 -04:00
Kelenius
c8b510b415 Adds unit tests
Port of https://github.com/Baystation12/Baystation12/pull/11808 and
several others
Fixes three overlapping cables ([192 / 158 / 1], [214 / 161 / 1], [122 /
197 / 1])
Fixes drill and mech drill having the same ID.
2016-03-29 17:42:22 +03:00