Commit Graph

3930 Commits

Author SHA1 Message Date
Neerti
9e67df09f0 Adds map. Mapmerge is broken so the line numbers are huge. 2016-07-08 21:26:19 -04:00
Jon
82e6232d27 Fixes one missing area tile. 2016-07-08 19:48:15 +01:00
Jon
d585fed77c Map updates 2016-07-08 17:43:34 +01:00
Jon
0c04e05f6d Mapmerge 2016-07-08 16:27:33 +01:00
Jon
88debefe3e The Beruang can now sent to visit the station once per round, with traders gathered, in the same manner as the admin ERT call! 2016-07-08 16:07:34 +01:00
EmperorJon
5b3c952be9 Merge pull request #2039 from SinTwo/smallfeatures
Water-Coolers, Floor Lamps, and Benches
2016-07-08 09:54:11 +01:00
Neerti
16426833cd Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 7/5/2016_ai_core_defense 2016-07-05 17:39:26 -04:00
Neerti
bcca19bc71 AI Core Update
Changes layout of the AI core, see picture in PR.
Moves APCs for core and upload to the backs of the rooms.
Critical APCs can somewhat resist EMP now.
Gives turrets a ten second timeout until they go underneath the turret covers, unless turned off manually or if they lose power.
Adds a new type of turret specifically for the AI upload/core.  This type has more health, has a 1/3 chance to ignore EMP, and fires xray lasers, to counter ablative armor.
A new material called Durasteel has been added.  It is made from Plasteel and diamonds, and boasts more toughness than Plasteel alone, as well as reflectivity.  The inner walls of the AI core are made out of this new material, which makes emitters less helpful.
Emitters can be damaged by projectiles, and will explode if too much damage is sustained.  Shooting a Durasteel wall will likely cause you to lose the emitter.
New AI core turrets turn green when on lethal, to show that xray is coming.
2016-07-05 17:33:34 -04:00
Yoshax
5660b8b0a6 Adds missing robotics shutters 2016-07-05 13:53:50 +01:00
woodratt
55562aeb3f - Adds Serena's Trade Ship along with all the odds and ends required to have it work properly.
- Adds a special snowflake mutt as well for ease of teleportation to the trade ship area prep area.
2016-07-04 14:07:14 -07:00
Datraen
606cc7ce15 Updates map. 2016-06-29 16:33:04 -04:00
SinTwo
8ecc72412d minor fixes and icon adjustment 2016-06-19 23:30:46 -04:00
Yoshax
f367426009 adds a bedsheet 2016-06-17 19:19:23 +01:00
Yoshax
1a88aef625 Modifiers visitor rooms layout 2016-06-17 15:56:09 +01:00
Datraen
299059a5be Merge pull request #1883 from Yoshax/drinks
Ports GinjaNinja32's drinks rewrite from Bay
2016-06-10 23:08:41 -04:00
Neerti
48ed49ad39 Merge pull request #1888 from Yoshax/outpostwidnows
Research outpost toxins now has fancy borowhatever windows
2016-06-08 01:15:26 -04:00
Yoshax
65c4f53cdd Research outpost toxins now has fancy borowhatever windows 2016-06-07 19:24:52 +01:00
Yoshax
167aeac11b Adds droppers to kitchen, adds an abundance of soap elsewhere 2016-06-07 19:03:29 +01:00
GinjaNinja32
debfd3dabf Ports GinjaNinja32's drinks rewrite from Bay 2016-06-06 20:33:11 +01:00
Datraen
fa74226e99 Merge pull request #1844 from SpadesNeil/GunsGunsGuns
Guns, Guns, Guns (Now in a PR less stupid)
2016-06-05 13:25:26 -04:00
Yoshax
ac3a1bd691 Robotics slight adjustments 2016-06-04 15:08:01 +01:00
Spades
c173d0dbb7 The last commit. 2016-06-03 21:01:53 -04:00
Spades
23e609ccb3 Fuckit. Silenced sound can go. It's unrealistic anyway.
I could have fixed it but meh.
Also map cleanup.
2016-06-03 20:37:05 -04:00
Spades
a063c8915e Feedback based on meeting.
- Removed carbine from the cargo.
- Removed SVD.
- Removed FiveSeven. Added sprite to gun resprites.
2016-06-03 20:21:12 -04:00
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