Commit Graph

196 Commits

Author SHA1 Message Date
Markolie
266b4cb113 R&D UI rework 2014-12-22 17:38:22 +01:00
Markolie
47f4161fbb Bug fixes, map fixes 2014-12-22 14:47:58 +01:00
Fox-McCloud
19e3da608b AI Satellite 2014-12-21 20:31:40 -05:00
Markolie
56fd43a4bb Gamma armory name 2014-12-21 13:35:13 +01:00
Markolie
138efdcec9 Xeno area 2014-12-20 23:10:24 +01:00
Fox-McCloud
b68c0536cc Xenobotany 2014-12-19 05:07:36 -05:00
SamCroswell
691991e444 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
r infinity"

This reverts commit 46d2000d8b.

Conflicts:
	maps/cyberiad.dmm
2014-12-18 21:09:43 -05:00
SamCroswell
f0801b2416 Syndicate Depot, Turret Fixes, Telesci Proofing
- Adds the Syndicate depot, an outpost heavily guarded by turrets, and
proofed against telescience.

- Fixes gun_turrets not ID'ing syndicate agents properly, adds support
for different bullets.

- Adds support to make an area un-accessible to telescience. I wish
there was a better way to handle that in the telescience computer, but
noone I consulted could seem to figure a way out. Simply set the area
tag in question's tele_proof to 1 to disable telescience in that area.
2014-12-18 19:16:07 -05:00
Markolie
5df11b77c2 Remove power requirement from Gamma shuttle 2014-12-18 13:50:50 +01:00
Markolie
19fde1c4a0 Bug fixes 2014-12-17 21:56:37 +01:00
Markolie
8c6339d853 Fix CentCom dock 2014-12-15 21:30:13 +01:00
Markolie
e648bb959e Alien bugfixes 2014-12-15 12:04:30 +01:00
Markolie
22eb3e3c29 Bug fixes 2014-12-13 21:53:01 +01:00
Markolie
37b86cd8f1 Xenos gamemode rework 2014-12-13 02:08:22 +01:00
SamCroswell
a1959291b7 Coin Flipping! Also more map fixes. 2014-12-04 17:12:41 -05:00
SamCroswell
7a3f19d00f Area Tag Fix, Bar Is No Longer Space
The bar is no longer exposed to space via a tile under the booze-o-mat,
fix the area to be unpowered by default.
2014-12-03 19:41:33 -05:00
SamCroswell
f1b5476a85 Dance Bar Update 2014-12-03 19:18:00 -05:00
Markolie
0f42e96159 Adds some additional photocopiers 2014-12-03 03:03:02 +01:00
Markolie
bd11c78235 Replace every instance of NanoTrasen with Nanotrasen. 2014-11-29 21:01:29 +01:00
Markolie
0dc52900cc Adds the service channel (:v) 2014-11-29 21:01:19 +01:00
Markolie
3a9d45c2d6 Adds podbay doors to the pods that can be opened using the button, or from within the pod. Also includes other map fixes. 2014-11-23 22:44:00 +01:00
Markolie
42dd08ff7d Variable typo fix, add proper Unati/Tajaran hardsuit conversion from Baystation 2014-11-22 02:24:21 +01:00
Markolie
421c461705 Some more map fixes 2014-11-21 03:17:10 +01:00
Markolie
e9e3705e61 Minor map fixes, teleporter description fix 2014-11-21 01:18:41 +01:00
Markolie
e2e996fbbf Glass now changes color when built based on the area, map fixes 2014-11-20 00:08:29 +01:00
Markolie
d490c939c0 Capitalization fix 2014-11-19 01:31:34 +01:00
Markolie
cbe2bee4c2 Crazy amount of map fixes. 2014-11-15 01:39:00 +01:00
Markolie
b2d0e26a6d Add meson goggles to atmos lockers, add alert camera monitors to engineering 2014-11-14 15:55:38 +01:00
Markolie
fb34be5c28 Separate the Magistrate's Office from the IAA's Office 2014-11-14 15:09:05 +01:00
Markolie
0cd3223536 AI fixes, borg fixes, map fixes 2014-11-14 14:15:17 +01:00
Bone White
6f40f1ed3d Gravity mega stun fix 2014-09-13 08:48:17 +01:00
Bone White
c23a8d3513 Adds traitor station z level
also access via telescience with emag and z level set to 7
2014-08-28 14:58:17 +01:00
Bram961
4295c1b4fe Map fixes
-Telescience pad has atmospherics now
-LOTS of minor fixes like airlocks not having their respective
controllers, weird lights, etc etc etc.
2014-07-25 20:20:38 +02:00
Necaladun
61e8fc8117 Minor map tweaks
Moved blueshield's laptop, added proper area tag for recruiter
2014-07-22 18:21:16 +09:30
Necaladun
9b5bb0c1dc Area tags for embassies
Area tags and fugly images
2014-06-24 12:01:05 +09:30
Giacomand
f32f2b329f Mobs will now slowly bop up and down while in zero gravity.
Conflicts:
	code/game/area/areas.dm
	code/game/turfs/turf.dm
	code/modules/clothing/shoes/magboots.dm
	code/modules/mob/living/carbon/human/human_movement.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/living_defines.dm
	code/modules/mob/mob_movement.dm
	code/modules/power/gravitygenerator.dm
2014-06-17 01:13:32 -04:00
ZomgPonies
8ad505e18c Added abandoned drug lab to map. 2014-06-06 16:00:53 -04:00
Zuhayr
4f37a924fe Replaces the derelict, modifies the DJ station, adds a shuttle bay to Engineering.
Conflicts:
	baystation12.dme
	maps/tgstation2.dmm
2014-06-04 15:30:09 -04:00
ZomgPonies
5f67943f8e Revert "APC bugfix after someone messed with mah areas!"
This reverts commit ceca0ddbe8.
2014-05-27 21:22:53 -04:00
Ccomp5950
ceca0ddbe8 APC bugfix after someone messed with mah areas!
This was probably bound to happen either way the previous version was based upon a faulty understanding of how the areas worked this is much more robust and only messes with the master areas
and master areas needing power updates call power updates for the each of it's child areas.  Also added where messing with SMESes called for an update on all areas power consumption, probably
not required but doing so either way.

We also rebuild the active_areas list every 5 minutes, if you get a engineer that wants to build a new area off of the station with APC's set rebuild_all_areas in the master controller and it will
update instantly, otherwise wait 5 minutes.  The only downside to this 5 minutes is you might get free energy until that area becomes active.

Conflicts:
	code/controllers/master_controller.dm
	code/modules/power/apc.dm
2014-05-27 00:28:31 -04:00
Mloc-Argent
1b2f83dee4 BS12 Hooks 2014-05-22 23:56:35 +02:00
ZomgPonies
f929f83883 Finished mechanic workshop 2014-05-18 05:47:22 -04:00
SamCroswell
666a953c6c Requested Map Changes 2014-05-05 19:57:16 -04:00
thatprogrammerguy
ac100a8568 A more strict dynamic room selection code, and fixed an incorrect area definition for the dynamic lobby south of customs. 2014-05-02 17:27:57 -04:00
thatprogrammerguy
303fb1e476 Dynamic room balancing - added initial code for a more stricter selection process. 2014-05-02 14:22:39 -04:00
thatprogrammerguy
95dfb85675 Added dynamic areas, currently the only one sits under customs. 2014-05-02 02:52:08 -04:00
alex-gh
71151c0c57 Merge pull request #183 from alex-gh/event_area_rework
Events can now strike all areas instead of few select ones
2014-04-20 14:07:27 +02:00
alex-gh
8a9130026a Events can now strike all areas instead of few select ones 2014-04-20 14:04:15 +02:00
Necaladun
5e812fb047 Club needs power
Club now needs power, APC is added
2014-04-20 12:27:53 +09:30
alex-gh
521ad31671 Revert the new lighting system. 2014-04-07 23:51:35 +02:00