Commit Graph

292 Commits

Author SHA1 Message Date
Markolie
be9ea0b540 Alarm system tweaks 2015-08-02 19:20:37 +02:00
Markolie
73e94b5dc4 Alarm system overhaul 2015-08-02 07:13:03 +02:00
Markolie
aca3a2cecb Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into powernet
Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm
	code/game/machinery/alarm.dm
	code/modules/power/smes.dm
2015-08-01 21:44:47 +02:00
Markolie
51035f931e Powernet rework 2015-07-31 23:59:41 +02:00
Markolie
d349beec3c Add NanoUI multi-clone pod support 2015-07-30 21:58:19 +02:00
Markolie
48088db9f8 Add multi-clonepod support to cloner 2015-07-30 20:03:57 +02:00
Markolie
69f7e04719 Prison break refactor, Requests Console refactor 2015-07-29 00:12:44 +02:00
Markolie
1e5b51fda3 Abandoned ship mapfix 2015-07-28 18:13:19 +02:00
Markolie
56989c8fbd Convert multi shuttle UI's to NanoUI 2015-07-28 04:39:00 +02:00
SamCroswell
ebabf9f7bb Map Edits, Minor Fixes 2015-06-29 16:22:59 -04:00
PJB3005
8ad74ebb6e Fixes all your problems...
Except the fact that 75% of paradise is still using del, and you have no pooling.

Or defer_powernet_rebuild, do you guys have that yet?
2015-06-20 14:47:45 +02:00
Fox-McCloud
83fb1a4bab Codebase Size Reduction--Music 2015-06-17 18:14:14 -04:00
FalseIncarnate
9074629123 Aquariums and Pet Rocks!
Adds fishbowls, fish tanks, and wall aquariums.
- Buildable with glass
- Fish Tanks and Wall Aquariums also have built-in lights that can be
toggled
- Wall Aquariums block atmos just like a full window or wall.

Adds fish and fish/aquarium related items:
- Goldfish, Clownfish, Sharks, and Baby Space Carp
- Eggs can be obtained for each of these fish types and a dud egg type.
- Fish food, fish nets, egg scoops, tank brushes
- These are used to maintain your aquarium

Adds new vendor: CritterCare!
- Sells pet supplies and pet rocks!
- Moved pet collars from the clothing machine into the CritterCare

Adds new room/area: Pet Store!
- Located between the Port Emergency Storage and Auxilary Tool Storage
(across from the Vault)
- Contains a CritterCare machine, 2 fishbowls, a bucket, and a sink

Adjusts some Cargo order options!
- New category: Vending
- Contains all the vending machine refill crates
- Renamed the Bartending Supply Crate to Bar Supply Crate to avoid
confusion
- Removes the coffee refill canisters from the Bar Supply Crate, placed
them into the new Coffee Supply Crate
- Adds new Clothing Supply Crate, contains refill canisters for the
Hatlord 9000, Suitlord 9000, Shoelord 9000, and ClothesMate vendors
- Adds new Pet Supply Crate, contains refill canisters for the new
CritterCare vendor

Makes the ClothesMate and CritterCare vendors constructable
- Using a screwdriver on a vendor circuitboard will now have a chance to
set it to the ClothesMate or CritterCare setting, in addition to the
previously possible settings like Booze-o-mat and Shoelord 9000.
New reagent: Fishwater
- Obtained by using an empty reagent_container on any aquarium that has
some water in it.
- Ingesting fishwater has a 30% chance per cycle to make you vomit (what
did you expect from dirty water and fish poo?)
- Fishwater is good for botany, as it provides both water and nutrients
to hydro trays

ADDITIONAL FIXES!
- Fixes the abandoned bar's misaligned area (mostly a mapper thing, will
also ensure an APC in the area will properly power the entire area (and
not space)
- Fixes a couple instances of piping mistakes where there were manifolds
and straight pipes on the same tile, preventing vent-crawlers from being
able to navigate properly
- One was in security, another was the back room of hydroponics
- Fixed a missing pipe in the AI upload causing the vent to be
disconnected from the pipe network
2015-06-12 04:14:28 -04:00
Tigercat2000
82f6855755 Initial Compiling port of MetaStation 2015-06-04 09:12:37 -07:00
Fox-McCloud
6f345ee1e3 Maintenance Rework Part Two 2015-06-02 21:44:43 -04:00
Fox-McCloud
8e11d0ec6a Merge pull request #1142 from tigercat2000/ambi
Makes Area Ambience a list on the area, Maintnance ambience
2015-05-23 20:57:03 -04:00
IAmBigCoat
cdc10b2178 Adding area adjustment.
Need to add servercold to areas.dmi and re-add the mapd
2015-05-22 23:41:10 -04:00
Tigercat2000
002fb9f947 Makes Area Ambience a list on the area, Maintnance ambience
This commit refactors the area ambient sound system to pick from a list
defined on the area definition itself instead of a lengthy else-if change.
This is mostly noticable to people making new areas or modifying area
ambient sounds.

This commit also adds 5 maintnance ambient sounds from -tg-.
2015-05-22 16:15:50 -07:00
Tigercat2000
177db675d6 Replace all instances of /area alone to /area/space
This commit replaces every instance of /area(blank) with
/area/space(blank). The world default area has been replaced with
/area/space.
2015-05-22 11:22:38 -07:00
Krausus
cd0013c72e Fixes name of Warden's Office area 2015-05-18 03:16:55 -04:00
Tigercat2000
21b1017178 Makes the white telecomm ship an actual movable shuttle 2015-05-14 14:55:22 -07:00
Krausus
159a12bc64 Fixes mech and pod fabricators
I have no idea how this code ever worked in the past.
2015-05-12 03:37:37 -04:00
Tigercat2000
c2038640f7 Lighting Overhaul Map stuff
This commit fixes up the map to account for the new shuttle lighting
system brought by the lighting overhaul.

Things changed:
 - Shuttles now all have lightbulbs in them
 - Syndicate Mothership now uses lighting as well, for a dark-forest look.
2015-05-10 16:58:41 -07:00
Tigercat2000
e1249fc640 Lighting overhaul.
This commit overhauls the lighting system to Bay12 standards. It is better
in pretty much every way.
2015-05-10 12:03:27 -07:00
Fox-McCloud
4edc23cd11 Ambience Runtime Fix 2015-05-05 16:44:08 -04:00
Bram961
1b75aacec0 Popping sound fix
Fixes the popping sound heared when white noise is toggled on.
2015-04-22 03:59:10 +02:00
Bram961
4950e9c59a Splitting the Ambience and background noise
Splits off Ambience sounds and the background "shipambience.ogg" under
two difrent buttons.
2015-04-19 13:29:27 +02:00
SamCroswell
e6a6803e24 Thunderdome - Reset Thunderdome Button 2015-04-06 11:22:21 -04:00
Markolie
24626bc081 Testing lab changes 2015-03-21 16:18:42 +01:00
Fox-McCloud
01fa55adda Test Lab 2015-03-20 07:11:30 -04:00
Markolie
cf0220312b Bug fixes 2015-03-02 18:30:40 +01:00
Markolie
9816cf37cc Fix incorrect var name 2015-03-01 02:16:45 +01:00
Markolie
b28f791f8f (Porta) turret update, map area update 2015-03-01 02:10:32 +01:00
Markolie
d8d1670b68 Revert "Revert "Saycode/language/species port from Bay""
This reverts commit d54579850c.

Conflicts:
	code/game/gamemodes/nuclear/nuclearbomb.dm
	code/game/objects/items/devices/radio/intercom.dm
	code/modules/mob/living/silicon/pai/pai.dm
2015-02-20 17:46:35 +01:00
ZomgPonies
d54579850c Revert "Saycode/language/species port from Bay" 2015-02-19 20:15:42 -05:00
Markolie
46c53be6f1 Part 2 of saycode/language/species port from Bay. Also includes bugfixes. 2015-02-20 00:50:28 +01:00
Markolie
8726bad5b0 Z-level check refactor 2015-02-16 20:33:28 +01:00
Fox-McCloud
c2f84b67f0 Merge pull request #279 from Markolie/master
[BUGFIX] Add report_alerts variable to areas, zeroth law fix, cameranet code update
2015-02-10 21:35:30 -05:00
Artorp
d708d53a6c Fixes ambience sound preference 2015-02-10 07:32:14 +01:00
Markolie
26d0de51bb Add report_alerts variable to areas 2015-02-10 02:07:02 +01:00
Fox-McCloud
de51d86a98 Abandoned Teleporter 2015-02-06 17:29:11 -05:00
Markolie
2dfdd7243c Disable hardsuit breaches, re-add engi shuttle 2015-01-19 18:18:58 +01:00
Markolie
e59a94a8a1 Constructable newscaster, labor camp overhaul, other fixes 2015-01-16 21:50:33 +01:00
Markolie
6a0d3a60b7 Changeling DNA fixes 2015-01-13 20:17:00 +01:00
Markolie
d1eadab31c Away mission fix 2015-01-12 04:29:53 +01:00
Markolie
c70a6c172b Away mission port from /tg/ 2015-01-09 00:12:16 +01:00
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