Commit Graph

140 Commits

Author SHA1 Message Date
Aryn
5b2f811b71 Lighting system is too buggy to continue until I know wtf is going on
Conflicts:
	baystation12.dme
	code/game/turfs/turf.dm
2014-02-28 17:47:50 -05:00
Lokiamis
544c39f7c2 salvage
Conflicts:
	code/game/jobs/access.dm
	code/game/objects/items/weapons/cards_ids.dm
	maps/tgstation.2.1.0.0.1.dmm
2014-02-16 10:38:52 -05:00
SamCroswell
4101ce7b5d Admin room revamp 2014-02-08 13:35:35 -05:00
ZomgPonies
88ee7313b5 Merge pull request #139 from SamCroswell/master
Additional Select Equiptment Option, More Areas
2014-01-30 23:46:47 -08:00
SamCroswell
0e20cec0d4 Various Map / Ninja Fixes 2014-01-30 23:39:14 -05:00
SamCroswell
76840fae78 Additional Select Equiptment Option, More Areas 2014-01-29 17:03:14 -05:00
ZomgPonies
6dfa08040c Merge pull request #131 from SamCroswell/master
More C4 suicide phrases. For no Raisin.
2014-01-28 20:15:26 -08:00
ZomgPonies
7014f6f83e More fixes to text2speech 2014-01-27 16:58:52 -05:00
SamCroswell
540a33b5e0 Deadeagle's Changes
Deadeagle made some changes to the map, uploading them
2014-01-27 15:56:54 -05:00
SamCroswell
cf7e3683ec Telescience Layout Change 2014-01-26 03:02:33 -05:00
ZomgPonies
6dbf776ff4 Gamme to shuttle, part two 2014-01-16 06:57:17 -05:00
SamCroswell
51a4a6ee4f EXTREMELY buggy Ninja code 2014-01-14 23:58:21 -05:00
alex-gh
71a065438d Shuttles outside of SS13 are no longer valid areas for events 2014-01-13 07:03:54 +01:00
d3athrow
64d8903802 Following /tg/'s lead, removes set background 1 for smoother gameplay.
Conflicts:
	code/game/objects/effects/glowshroom.dm
	code/modules/mob/living/carbon/zombie/zombie.dm
	code/modules/mob/living/silicon/mommi/life.dm
2014-01-08 01:25:20 -05:00
ZomgPonies
0455f35e5b Firelock fixes 2013-12-25 07:46:09 -05:00
ZomgPonies
a6b92777fa BYOND 501 Blend modes for alarms 2013-12-19 11:34:58 -05:00
alex-gh
2fbc85edbb Map Fixes 2013-12-19 13:17:34 +01:00
ZomgPonies
4181829014 Revert "Revert "Some pretty awesome fire/airalarm fixes""
This reverts commit 2ec7b67db6.
2013-12-15 04:21:05 -05:00
ZomgPonies
36bc1120c8 Revert "Area lighting fix"
This reverts commit f2422e4c9e.
2013-12-15 03:47:32 -05:00
ZomgPonies
2ec7b67db6 Revert "Some pretty awesome fire/airalarm fixes"
This reverts commit 0056c74db0.
2013-12-15 01:47:35 -05:00
ZomgPonies
f2422e4c9e Area lighting fix 2013-12-14 19:30:56 -05:00
alex-gh
97c1e1810a Re-added code from 9e5be13 2013-12-14 21:34:36 +01:00
ZomgPonies
0056c74db0 Some pretty awesome fire/airalarm fixes 2013-12-14 06:47:24 -05:00
ZomgPonies
c2b596e31d Xeno Gamemode Fixes 2013-12-11 19:22:57 -05:00
ZomgPonies
51691472f8 Finalized Gamma Armory 2013-11-28 04:21:32 -05:00
ZomgPonies
348faebe7c Pretty much finished new sec levels Yay 2013-11-26 14:36:36 -05:00
ZomgPonies
52907cdb23 Fixed and working clown planet 2013-11-21 03:03:04 -05:00
ZomgPonies
f2ea1dc1c9 Secret Space Gaybar 2013-11-17 04:19:33 -05:00
alex-gh
9e5be13497 Buckling in will prevent you from falling down in weightless event 2013-11-12 08:03:06 +01:00
ZomgPonies
62b0e5127b Revert "Nicer looking alarm overlays"
This reverts commit ac74d6baf7.
2013-11-06 20:24:11 -05:00
ZomgPonies
ac74d6baf7 Nicer looking alarm overlays 2013-11-06 17:30:06 -05:00
alex-gh
368924b93d Map fixes 2013-11-05 16:19:13 +01:00
ZomgPonies
8bf368f547 Telescience! 2013-11-04 07:48:43 -05:00
ZomgPonies
28d8f6f738 Re-education campt for naughty players. Glory to Cyberiad! 2013-10-30 03:13:47 -04:00
ZomgPonies
80413d809c SS13 Radiation alert 2013-10-27 04:52:07 -04:00
ZomgPonies
2907deae87 New barber shop. Can now shave corgis. 2013-10-17 16:18:35 -04:00
ZomgPonies
060aa39f16 Map updates to make atmo moar better. 2013-10-15 16:28:39 -04:00
ZomgPonies
77567ba6cd Fixed air alarms & problematic N2O tank 2013-10-05 03:23:50 -04:00
ZomgPonies
78f14f11cc New vending machine, enabling Ian clothes, bug fixes, map update 2013-09-28 01:38:18 -04:00
ZomgPonies
dadbd68741 Clownplanet update + minemech broken sprites 2013-09-26 06:46:02 -04:00
ZomgPonies
c1222034ee BS12 -> Ponies merge 2013-09-09 10:51:16 -04:00
Segrain
cd2922cebe Name fix. 2013-08-23 15:30:49 +03:00
Segrain
f13c84ed04 Fix for power alarms cameras. 2013-08-04 01:05:50 +03:00
Segrain
6ab1011e8e Alarm cameras. 2013-07-28 01:25:55 +03:00
Zuhayr
3227f669b1 Added a shuttle for the Vox to use. 2013-07-27 06:15:15 -07:00
Spamcat
10ee1fbcfe World loops 2: Electric Boogaloo. 2013-07-01 19:43:56 +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
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
Chinsky
61cf1b279d Security wing remap. 2013-05-10 16:05:23 +04:00
Cael_Aislinn
9c0fb003ac some new [old] sound effects, turrets make ambient noise occasionally, bit more roundstart music, some more ambient music for areas
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-23 21:48:48 +10:00