Commit Graph

421 Commits

Author SHA1 Message Date
Atlantiscze
641098fe78 SMES (de)construction:
- Adds supply pack for SMES coil. Costs 75 points for single coil.
- Adds design for SMES circuitboard. Needs diamonds, gold, silver and is very high tech.
2014-08-30 22:03:37 +02:00
Chinsky
f40298715f Merge pull request #6153 from PsiOmegaDelta/AtmosList
Central Atmospherics Computer - Air alarm sub-list
2014-08-26 15:25:59 +04:00
Chinsky
1c2cc138d6 Merge pull request #6168 from Kelenius/OfCablesAndStacks
Cables are now stacks
2014-08-26 15:25:31 +04:00
PsiOmega
2786c8e8b9 Remote air alarm control for the isolation cells now available on the outpost. 2014-08-25 23:24:35 +02:00
Kelenius
a1348faa8c Cables are now stacks 2014-08-25 18:54:35 +04:00
PsiOmega
d8b803d5e3 Fixes #6130
The construction outpost now has an air supply and rudimentary distribution system.
Glass and wood stacks are filled to their max stack sizes, 50 and 32 sheets respectively.
Ghosts can now teleport to Z-level 4.

There are now special air alarms which do not broadcast their alarms. These are used in the mass driver areas to let crew know when it's safe to use them again.
These air alarms have also been installed in the Research isolation cells to finally allow scientists to check what's up, at least as long as they are in there or have AI assistance.
2014-08-23 10:20:24 +02:00
mwerezak
0345024f04 Removes telecomm and RD server temperature cap 2014-07-28 20:24:17 -04:00
mwerezak
5eaebce87e Merge remote-tracking branch 'upstream/dev' into power-net 2014-07-27 20:25:57 -04:00
mwerezak
83d54af746 Adjusts power usage for R&D equipment 2014-07-27 03:36:28 -04:00
Zuhayr
ea8b08c49b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hydroponics 2014-07-25 22:34:40 +09:30
Zuhayr
4d1812ba2b Hydroponics rewrite, details will be in PR. Big commit. 2014-07-25 22:16:04 +09:30
Zuhayr
7fb8f30cc7 New machines, adjusted Cael's seeds, rewrote space vines. 2014-07-25 22:15:33 +09:30
mwerezak
79d4c444c2 Merge remote-tracking branch 'upstream/dev' into power-net
Conflicts:
	code/ATMOSPHERICS/components/binary_devices/pump.dm
	code/game/machinery/alarm.dm
	code/game/machinery/spaceheater.dm
2014-07-24 16:04:41 -04:00
Mloc-Argent
d5e9851b62 integrate XGM into the code
New turf proc: assume_gas().  Maps to air.adjust_gas_temp().
Lots of optimizations to processing, fire, lighting, HasEntered() and
 more.
Zones now process all fire data and existance in one go, fire objects
 only handle spreading.
Most code has been ported straight so some of it mightn't be ideally
 structured for the new gas_mixtures.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-07-22 19:52:12 +01:00
mwerezak
c46904a3b6 Merge remote-tracking branch 'upstream/dev' into power-net
Conflicts:
	code/ATMOSPHERICS/components/binary_devices/pump.dm
	code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
	code/ATMOSPHERICS/components/unary/vent_pump.dm
	code/ATMOSPHERICS/pipes.dm
2014-07-18 15:02:07 -04:00
Mloc-Hibernia
51d2451c01 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	nano/templates/geoscanner.tmpl
2014-07-18 13:15:30 +00:00
mwerezak
5ca36fcadb Merge branch 'dev' into power-net
Conflicts:
	code/game/machinery/Freezer.dm
	code/ATMOSPHERICS/components/unary/heat_source.dm
	code/modules/organs/organ_external.dm

Also updated:
	code/ATMOSPHERICS/components/binary_devices/pump.dm
	nano/templates/gas_pump.tmpl
2014-07-16 16:14:52 -04:00
Walter0o
8baf6e4661 another missing battery check 2014-07-16 15:20:23 +02:00
Walter0o
9d3a87115a missing power check
people could still use this without any charge
2014-07-16 15:13:13 +02:00
Chinsky
61f8713941 Possible fix for #5645
I think issue is that harvester won't forget what artifact it is using until harvesting process is started.
2014-07-16 16:22:26 +04:00
Chinsky
5018330a5a Fixes #5650
Fixes #5649
Removed that mundane objects check as I couldn't think of why would that even be a thing.
2014-07-16 14:37:12 +04:00
Chinsky
d1687dc50e Fixes #5648
Now scanner will just give warning if clicked too fast, instead of giving obsolete data.
Also moved code from New() to initalize(), since it depends on all things already being there and a master controller existing.
2014-07-16 13:39:56 +04:00
Chinsky
561eb99561 Fixes #5647 Fixes #5646 2014-07-16 13:26:13 +04:00
Zuhayr
d050f0a30b Merge pull request #5620 from Decius-R/loyalty_implants
Loyalty Implants
2014-07-15 10:30:48 +09:30
Decius
203c36114d Made spawning with a loyalty implant compliant to configuration...
Created a proc for being implanted with loyalty implant which
checks for the configuration for whether or not it will work. If it is
enabled, it continues on-- if it is disabled, it returns from the proc.

Also made secure closets not automatically spawn them unless the config
is set to allow it.

Admin 'loyalty implanting' via the panel is now compliant to the
configuration file. If preferred, I am willing to make an override variable
to the proc that will allow admins to do it anyway.

Supply pack for it commented out due to inability to make it conform.
Easy enough to re-add back for anyone downstream if they wish it. Same
applies to the design.


Signed-off-by: Decius <deciusreln97@gmail.com>
2014-07-14 17:21:11 -04:00
mwerezak
f2a74327fb R&D Server heat production and power usage 2014-07-11 15:14:54 -04:00
Mark Aherne
7e7e6cd8ac Continued work in progress on a major revision of the NanoUI templating system. 2014-07-11 10:48:42 +01:00
PsiOmega
b86b80f963 Fixes #5487
Isolation air alarms now expect atmos, engineering, OR research access.
2014-07-04 00:28:06 +02:00
Zuhayr
574d07f8d9 Fixes #5410 and possibly #5399 2014-07-01 01:04:29 +09:30
Zuhayr
bd02a78f9c Fixed dev bug with destructive analyzer and null matter lists. 2014-06-29 10:25:03 +09:30
Chinsky
7e56df8689 Merge pull request #5308 from mwerezak/wound-infections
Re-enables infections, implements a wound infection system, improves body temperatures
2014-06-22 22:04:25 +04:00
mwerezak
b9fa433087 Adds suit cooling device
Also:

Breathing in hot/cold air will affect your body temperature.
Fixes old body temperature stabilization code not working.
Thermometer icon now adjusts based on species.
Reduced BODYTEMP_AUTORECOVERY_MINIMUM to a less ridiculous value.
2014-06-21 16:53:18 -04:00
Cael Aislinn
22cc2558ff switched autocloner and replicator artifacts over to a timer system, made replicator use materials to create items (materials can be anything)
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
2014-06-20 18:42:38 +10:00
Cael Aislinn
f02e6fdd45 rework talking items and re-enable them, made xenoarch boxes have a variable internal size, added three new eldritch xenoarch finds (poltergeist mask, vampiric statuette, endless replenishing container)
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
2014-06-20 18:42:25 +10:00
Cael Aislinn
ad35bf3262 harvester can now harvest artifact's secondary effect, which effect it chooses is determined by which are active (if both are active it can harvest neither)
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
2014-06-19 15:41:35 +10:00
Cael Aislinn
fc99c5b65f miscellaneous fixes to various anomaly utiliser effects involving location/holder issues, fixed anomaly harvester runtime, reworks anomaly utiliser to be a lot easier/nicer to use, balance tweaks:
- caps stun effect values for pulsing
- sets max utiliser battery charge to 300 (30 sec)
- changes energy consumption for utiliser pulse effects to "effect max charge level" * "effect range" ^ 2
- changes energy consumption for utiliser touch effects to 100 (10 sec worth of consumption)

Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
2014-06-19 13:52:21 +10:00
Cael Aislinn
f3ab8b0748 moved xenoarchaeology master controller code into a separate file
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
2014-06-19 11:07:12 +10:00
Cael Aislinn
0e1c367012 reconstitutor has a chance to extract multiple genomes per fossil (50% for two genomes, 37.5% chance for three genomes), moved xenoarchaeology initialisation code into the master controller, added upper and lower spawn vals for digsite turf number and artifact machine number, added circuitboards for the reconstitutors, fixes missing clonepod for flora reconstitutors
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
2014-06-19 11:06:20 +10:00
Cael Aislinn
6c46ceaf6d Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenoarchaeology
Conflicts:
	icons/obj/hydroponics.dmi

manual merge of conflicted icon file

Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
2014-06-19 10:05:27 +10:00
Chinsky
be95e54e43 Merge branch 'master' into dev
Conflicts:
	code/defines/obj/weapon.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/living/silicon/say.dm
	icons/mob/uniform.dmi
	maps/tgstation2.dmm
2014-06-17 16:16:44 +04:00
mwerezak
6dee9cf65d Adds sharp and edge flags to appropriate items
Went through as many /obj/item/weapons as I could find and added sharp
and edge flags where appropriate.
2014-06-16 13:26:44 -04:00
igalan
9a27556421 Let's test this rebase thing. 2014-06-14 15:20:25 +01:00
Zuhayr
c841db56b6 Merge branch 'mining' of https://github.com/Zuhayr/Baystation12 into dev 2014-06-11 09:24:28 +09:30
Zuhayr
5be9f0e12f Merge branch 'mining' of https://github.com/Zuhayr/Baystation12 into dev 2014-06-11 09:15:28 +09:30
Zuhayr
9e7fe6d700 Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this. 2014-06-11 01:14:38 +09:30
Zuhayr
78918e4795 Entirely removed the Honker mech, other refs to bananium, adamantine and mythril. 2014-06-08 00:52:20 +09:30
Zuhayr
c2f2a7cde6 Refactored material definitions a little bit, removed all bananium from the codebase. 2014-06-08 00:40:34 +09:30
GinjaNinja32
8228ef8d8e Fix xenoarcheology field generator 2014-06-06 16:00:24 +01:00
Zuhayr
00c81bb675 Moved engineering, research and mining shuttles to a generalized system with its own directory structure. 2014-06-03 15:26:34 +09:30
Zuhayr
1e135f91af Merge resolution with master. 2014-06-02 12:05:12 +09:30