Commit Graph
1031 Commits
Author SHA1 Message Date
Neerti f229aa479f Adds a bunch of prettiness to the TEG, fixes a runtime. 2015-03-04 09:13:05 -05:00
PsiOmega 81b0ab3bcf Mappings.
Makes specific instances of the engine room air alarm and AI APC.
Includes some map cleanup by Dream Maker itself.
2015-03-04 10:21:36 +01:00
PsiOmega 2c032cacaf Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-02-27 09:52:51 +01:00
PsiOmega 7e498e1cf7 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/modules/hydroponics/seed_datums.dm
	code/modules/hydroponics/trays/tray_apiary.dm
	code/modules/power/apc.dm
	code/setup.dm
2015-02-27 09:06:48 +01:00
Atlantiscze 488c25ae73 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into outpost-power 2015-02-24 13:09:05 +01:00
PsiOmega 93b049e7a6 Alarm centralization completion
Ensures the master area is always used, to avoid issues caused by dynamic lightning which splits areas into sub-areas.
Power alarms now handled centrally.
2015-02-23 11:23:23 +01:00
Atlantiscze 228651be1c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into outpost-power 2015-02-23 08:03:57 +01:00
mwerezak 657028026a Fixes APC emp_act()
Now properly handles the channel changes.
2015-02-21 14:55:13 -05:00
Chinsky 81599a9203 Merge pull request #8175 from Kelenius/ofBorgsAndSynths
Adds robot synths
2015-02-21 11:43:39 +03:00
Atlantiscze dca82ef90d Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into outpost-power 2015-02-20 12:38:03 +01:00
Kelenius a0b73140e9 Fixes for synths and decompiler 2015-02-20 13:32:10 +03:00
Kelenius 1c1e644f29 Adds robot synths 2015-02-19 21:04:27 +03:00
mwerezak 57ffdc82f6 Replaces stool structures with stool items 2015-02-18 01:06:00 -05:00
Atlantiscze 2d4926f72d Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into outpost-power 2015-02-17 16:05:47 +01:00
PsiOmega 06335b1064 The AI now has a personal power monitor interface. 2015-02-16 15:12:23 +01:00
Chinsky f9ba327c3a Merge pull request #8099 from mwerezak/gun-rewrite
Gun rewrite
2015-02-16 11:54:52 +03:00
RavingManiac 2ebf834b9b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2015-02-15 22:37:55 +08:00
RavingManiac cc62c987ea Some TEG refactoring and UI improvements
"circulator/heat exchanger" is now just called "circulator"
2015-02-13 18:34:48 +08:00
RavingManiac 71902cdca2 Tweaked descriptions and settings of various TEG components.
Maximum power of core vent and injector increased.
2015-02-13 16:08:52 +08:00
mwerezak 0d89717cf2 Merge remote-tracking branch 'upstream/dev' into gun-rewrite
Conflicts:
	code/modules/projectiles/ammunition/boxes.dm
	code/modules/projectiles/guns/projectile/pistol.dm
2015-02-13 01:57:19 -05:00
RavingManiac 98dd5c46c0 Circulators now draw air based on the total volume of the pipe network connected to the input. They also generate some power in the same manner as pipe turbines.
Thermoelectric generators now generate much more power, mostly due to the increase in circulator intake volume.

Supermatter no longer powers radiation collectors, and is tweaked to run at 4000-6000K.

TEG supermatter engine mapped in. Currently generates ~1MW of power with chamber temperature of 5000K.
2015-02-13 00:38:23 +08:00
Zuhayr a8089d4437 Merge master into dev. 2015-02-12 23:01:08 +10:30
mwerezak 5b5e16916f Replaces text expressions with macros 2015-02-12 01:55:12 -05:00
mwerezak 5ab6b91c5e Generalizes emp energy weapon drain to power cells 2015-02-12 01:37:41 -05:00
mwerezak ea39f7f718 Cleanup can_fire(), projectile flag
Removes can_fire() and moves some of it's functionality into
get_next_projectile(), which was renamed to consume_next_projectile() to
indicate the possibility of side-effects.
Also renamed flag var to check_armour
2015-02-12 01:37:19 -05:00
Atlantiscze 4c4411259a PACMAN Generator NanoUI
- Gives PACMAN type generators NanoUI, instead of the old UI
- Example screenshot: http://i.imgur.com/QhQEw1c.png (Red usually means it's bad. In this case, generator is operating at 10 power level, but maximal safe level is 4 (it's varedited to these values, normally it would be only 5/5). Overheats also give warnings (warning shown on screenshot is last warning which occurs approximately 20 seconds before explosion). Fuel is measured in cm3. For simplicity, 1 sheet = 1000cm3
2015-02-12 06:09:42 +01:00
mwerezak b7e3a14e0d Fixes machines being usable after a power failure
Fixes machines not gaining the NOPOWER flag after a power failure
because they were turned off and had use_power set to 0.
Fixes machines not gaining the NOPOWER flag after being moved into an
area with no power.

Both bugs allowed power using machines to be used in areas with no
power.
2015-02-11 23:28:53 -05:00
Atlantiscze 01b8873b9d Fixes PACMANs not working 2015-02-12 01:05:16 +01:00
Atlantiscze 34e116bbb0 Buffs engineering shuttle SMES to store a bit more power. 2015-02-09 18:54:01 +01:00
Atlantiscze 12be20ed73 Mapping changes preparation
- Adds Red and Blue simple pipes for mapping use.
- Adds empty CO2 PH and N2O canisters for mapping use.
- Reworks asteroid outpost areas. Old areas kept in separate file for downstream compatibility
- Modifies engineering shuttle to work with next commit.
- SMESs no longer have to be charged above certain level (~5%?) to actually begin outputting power.
- Fixes SMES related bug caused by previous commit
2015-02-09 18:53:02 +01:00
Atlantiscze 8eb08c2457 Adds more types of magnetic coils
- Adds high capacity, high IO and basic coil types.
- Adds two additional types of SMESs which contain new coil types by default. These will be used in next commit.
2015-02-09 01:14:33 +01:00
GinjaNinja32 4495f4c8ed Fixes possible href exploit with APCs 2015-02-08 19:58:28 +00:00
mwerezak 414ad6b6da Merge remote-tracking branch 'upstream/dev' into pacman
Conflicts:
	code/modules/power/port_gen.dm
2015-02-06 23:32:39 -05:00
PsiOmega 50064d86b3 Corrects ATM Machine syndromes. 2015-02-05 11:56:00 +01:00
Ravensdale 84fa5379c5 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mapSanity 2015-02-03 15:18:27 -08:00
Ravensdale 2e275d7e5e Area cleanup part 1: Engineering Department 2015-02-03 14:50:11 -08:00
Zulker Nayeen Nahiyan 0a3f523066 Merge remote-tracking branch 'refs/remotes/origin/dev' into dev
Conflicts:
	code/__HELPERS/maths.dm
	code/__HELPERS/type2type.dm
	code/modules/clothing/head/hardhat.dm
	code/modules/clothing/spacesuits/captain.dm
	code/modules/clothing/spacesuits/miscellaneous.dm
	code/modules/clothing/spacesuits/rig/rig_pieces.dm
	code/modules/clothing/spacesuits/rig/suits/light.dm
	code/modules/clothing/spacesuits/spacesuits.dm
	code/modules/clothing/suits/armor.dm
	code/modules/clothing/suits/utility.dm
	code/modules/events/event_manager.dm
	code/modules/mob/living/living.dm
	code/setup.dm
2015-02-04 04:44:09 +06:00
Chinsky b6ca496a93 Merge pull request #7617 from fira/obscomps
Observers Improvements: Ghosts are able to spy on computers, SMES and APCs, with NanoUI and OldUI support
2015-02-03 18:12:16 +03:00
Chinsky 72463a35f3 Another pass at WIP folder 2015-02-03 12:14:13 +03:00
Chinsky b995c856a9 Merge pull request #7924 from Kelenius/ofTablesAndPass
Removes FPRINT and TABLEPASS flags
2015-01-30 16:17:41 +03:00
mwerezak 9bfa6093a2 Fixes portable generator balance
Adjusts values so that the portable generators aren't so useless.
2015-01-25 23:59:07 -05:00
mwerezak bbd541308c Generator temperature now affected by ambient air
Gives traitors more opportunities to sabotage the generator or allows
engineers to build additional cooling. Also fixes typo.
2015-01-25 13:51:46 -05:00
mwerezak fc872dda5d PACMAN update
Cleans up parts of pacman code, simplifies and improves temperature and
overheating mechanics. Temperature now gravitates to some set
temperature based on the power output, and if left above a max temp for
too long, the generator explodes as before. Rebalances all of the
various generator types.
2015-01-25 01:27:03 -05:00
Kelenius 10de826ca3 Removes FPRINT and TABLEPASS flags 2015-01-23 22:27:32 +03:00
PsiOmegaDelta 4ebd54f0af Merge pull request #7916 from GinjaNinja32/runtime
Fixes power runtime
2015-01-22 17:47:05 +01:00
GinjaNinja32 c97b54fe56 Fixes power runtime 2015-01-22 15:03:54 +00:00
Atlantiscze 8dbe6d2f35 Fixes two powernet related issues:
- First issue is power monitoring consoles showing slightly inaccurate values. The code calculated some sort of level average which resulted in stupid values being reported (like load 500kW available 300kW). This also fixes APC load partially showing as Other load on the console.
- Second fixed issue (Fixes #7869) resolved gamebreaking bug that caused total irreversible failure of all powernets if makepowernets() was called. This, for example, includes large enough explosions, via admin command, or few other cases.
2015-01-20 21:12:52 +01:00
Chinsky 6e7eb38c5d Merge pull request #7850 from Baystation12/master
master -> freeze
2015-01-16 14:23:03 +03:00
Loganbacca f711e3b24c Removed unnecessary check 2015-01-15 15:35:45 +13:00
Loganbacca f479ba9212 SMES UI tweak
Switching this to mirror output switching as in the last commit
2015-01-14 22:03:29 +13:00