Commit Graph

1228 Commits

Author SHA1 Message Date
skull132
443a49a49b Merge branch 'master' into development 2016-07-10 14:25:54 -04:00
skull132
8dfb08dab1 Fixes #549 (#551)
Lessons were learned.
2016-07-10 21:49:57 +03:00
skull132
30b6aff6cf Radio Jammers (#502)
Adds radio jammers for antags and improvised version as well.
2016-07-09 03:14:04 +03:00
skull132
242dbc3f6a Tesla Standardization
Brings the tesla interaction code inline with Bay12's base.
2016-02-21 22:24:14 +02:00
Lord Lag
1106cd7c1f Fixes #124
Vaurca use name instead of a flag for mechanics.
2016-02-15 16:14:33 +00:00
Atlantis
9c7a149481 Fixes #12046
- Now uses percentage instead of fixed value when determining whether charging at full capacity, or only partially.
- Adds new overlay for "Disconnected or No Charge" output status. Outputting overlay is now displayed correctly.
2016-01-26 13:44:09 +01:00
skull132
912fe7356e Merge remote-tracking branch 'Aurorastation/development' into new-engine
# Conflicts:
#	code/__HELPERS/unsorted.dm
2016-01-24 23:25:08 +02:00
PsiOmegaDelta
f976e82c63 Fixes the singularity expansion message.
A simple flip of a character. Fixes #11983.
2016-01-22 08:45:07 +01:00
Lord Lag
ee583b913d Vaurca Update
Vaurca for ne code, now with better sprites
2016-01-20 19:50:19 +00:00
skull132
0009eff042 Compile Fixes
The engine is now mostly operational and should be working. Still need to check it's ability to produce power, that might not work. Or maybe it does. Dunno!
2016-01-18 21:50:30 +02:00
Atlantis
5a09ad45a0 Tweaks
- Implements github suggestions
- Fixes one SMES that had incorrect settings from previous change.
2016-01-15 07:52:33 +01:00
skull132
5de3f05ae1 Initial Commit 2016-01-13 14:25:06 +02:00
Atlantis
ad30a3a19e SMESs no longer output by default
- Exception to this are SMESs that are intended to output - engine room, AI core, atmospherics, telecommunications, all asteroid outposts. This is why map changes had to be made.
2016-01-12 21:50:17 +01:00
Atlantis
2220ad7c56 SMES Load Balancing
- SMESs will now try to balance their inputs and outputs. This will correct the situations where some SMESs charge at full rate, starving other SMESs who are trying to charge from the same power net. In terms of output, multiple SMESs (such as, solar SMESs) will try to provide equal amount of power to the powernet.
- SMESs processing is now slightly different. UI now displays a "Disconnected or No Charge" error when the SMES does not have cable connection to output to, or when stored charge is zero. Once this problem is resolved (either by charging the SMES or by connecting it via wires) it will automatically begin outputting again.
- The only tiny bug i have registered so far is related to number precision. It is possible that powernets may gain or lose few watts (talking about 1-5 watts per powernet at most, it is negligible)
2016-01-12 21:38:23 +01:00
Atlantis
95ea641714 SMESs will no longer turn themselves off when they run out of power
- Instead, they simply won't output until some power is regained.
- This prevents, for example, solar SMESs from shutting down when they reach zero charge when the array is shadowed by the station. The SMES simply won't output any power until the array begins generating again.
2016-01-12 16:35:17 +01:00
GinjaNinja32
87f645a267 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2016-01-11 07:51:07 +00:00
PsiOmegaDelta
9b449cc183 Merge pull request #11963 from Baystation12/master
Dev-freeze
2016-01-11 08:28:56 +01:00
GinjaNinja32
a00a6ae0e6 Fix #11955 2016-01-10 22:12:12 +00:00
Atlantis
cbcd5ab035 Map fixes - Dev Edition
- See #11658 - this is just edition for Dev
- TLDR version: Fixes power alarm at construction site, fixes emitter button giving errors about not being connected to cable, unanchors emitters at mining outpost by default.
- Added subtype for inactive APCs as per PsiOmegaDelta's request
- Fixed gridcheck affecting telecommunications central compartment.
2016-01-07 12:34:38 +01:00
RavingManiac
6e82dfa381 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2016-01-04 19:25:36 +08:00
PsiOmegaDelta
b22d7c58bb Makes it possible to connect to cable nodes on shuttle plating.
Fixes #11852.
2016-01-03 12:49:27 +01:00
Ccomp5950
7dc9b3487a Merge pull request #11739 from PsiOmegaDelta/151214-ObserveThis
Qdel() tweaking and a bonus
2016-01-01 23:58:29 -05:00
PsiOmegaDelta
da0a4c47cf Merge pull request #11756 from Baystation12/master
Dev-freeze
2015-12-26 11:58:42 +01:00
PsiOmegaDelta
faec92b553 Can now join compatible cable coils of any type.
Partial backport of #11656. Fixes #10935.
2015-12-25 11:19:59 +01:00
ccomp5950
6736fb54e7 Merge branch '_base-turf' of https://github.com/mwerezak/Baystation12 into dev
Conflicts:
	code/game/area/Space Station 13 areas.dm
2015-12-17 20:25:36 -05:00
PsiOmegaDelta
1a8fc50f1e Removes suicide code. 2015-12-14 15:57:56 +01:00
Chinsky
21f8c4aef1 Merge pull request #11645 from PsiOmegaDelta/151209-CableRainbow
Now possible to change cable coil color using a multitool.
2015-12-12 02:54:49 +03:00
PsiOmegaDelta
e0c092fc54 Cleans up the previous commit's use of stacktype. 2015-12-11 11:18:27 +01:00
Hubblenaut
6b37b860d7 Fixes subcategories of cable coils not being mergeable 2015-12-11 11:09:11 +01:00
PsiOmegaDelta
d43cf313c0 Relocates color definitions. Lowercases color definitions. 2015-12-09 21:49:58 +01:00
PsiOmegaDelta
abcd965dde Now possible to change cable coil color using a multitool.
Obviously using the same methods that borgs use to change the cable coil color internally.
2015-12-09 20:20:28 +01:00
GinjaNinja32
1921c35231 fix issues with indented absolute path definitions 2015-12-09 14:12:54 +00:00
Chinsky
cbf51f9c73 Merge pull request #11605 from mwerezak/click-cooldown
Adds click cooldowns
2015-12-07 19:56:23 +03:00
Chinsky
8c6011de3f Merge pull request #11588 from PsiOmegaDelta/151204-DisposalsEverywhere
Fixes floors not hiding all intended objects.
2015-12-07 19:55:54 +03:00
Jon
c9b7a8ece3 Updates all get_base_turf usages to get_base_turf_by_area.
This means that instead of the base turf being defined by the z-level, it's now defined by area and defaulted by z-level.

Updates all "shuttle" and "solar" areas to have a base_turf of space.
Updates docking arms 1, 2, and 3 on the main asteroid level to have a base_turf of space.

Other z-levels may still need updating.

This change means that all actions which destroy or dismantle a tile - for example bombs, a singularity, a shuttle leaving, or deconstruction - now leave these new areas as space not asteroid. Future mapping efforts may need to take this into account.

Conflicts:
	code/game/area/Space Station 13 areas.dm
2015-12-06 14:01:21 -05:00
PsiOmegaDelta
b89e19e5a5 Merge remote-tracking branch 'upstream/dev-freeze' into dev.
Conflicts:
	code/datums/datacore.dm
	code/defines/procs/records.dm
	code/game/machinery/camera/camera_assembly.dm
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	code/modules/mob/language/station.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/mob/living/carbon/human/species/station/station.dm
	code/modules/surgery/organs_internal.dm
	html/changelogs/.all_changelog.yml
2015-12-06 11:48:20 +01:00
PsiOmegaDelta
6a22086c17 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/verbs/suicide.dm
	code/modules/nano/modules/crew_monitor.dm
2015-12-06 11:34:36 +01:00
mwerezak
fa6c8415ea Adds click cooldowns to common healing and repair actions 2015-12-06 00:23:49 -05:00
PsiOmegaDelta
6ceb3906ca Implements a reasonable /hide() default. 2015-12-04 11:15:44 +01:00
PsiOmegaDelta
37c5e316c0 Additional fixes.
Fixes terminals not hiding under floors.
Makes power sensors hide under floors correctly, the layering trick evidently didn't work.
2015-12-04 10:23:28 +01:00
Zuhayr
c2a4ee22cf Merge pull request #11316 from atlantiscze/apc-fix
Fixes #11149
2015-12-02 09:57:26 +10:30
Atlantis
e33ae21f75 Adjusts APC emag behavior
- Mostly under-the-hood changes.
- Emagged APCs may now have their panel removed with screwdriver, so you can access wires
- Emagged APCs no longer rely on locked var, instead they check for emagged var as mwerezak suggested.
2015-11-30 23:19:04 +01:00
PsiOmegaDelta
4e89045aab Merge pull request #11451 from Loganbacca/wireless
Wireless controller for machinery connections
2015-11-27 07:59:59 +01:00
PsiOmegaDelta
11db663fac Ghosts can now view any object with a NanoUI interface.
However, ghosts can now also only view objects in range to ensure that the NanoUI window count is kept low.
Admins do not suffer this restriction and may also interact with these windows.
2015-11-22 12:21:41 +01:00
Loganbacca
012f82fe23 Wireless control additions
Mass drivers, doors (airlocks and blast doors), igniters and sparkers, and emitters.
Sparker cleanup.
2015-11-22 22:32:52 +13:00
Loganbacca
56bf894ee1 Wireless button updates
Added toggle variants for buttons, allowing them to "deactivate" connected devices.
Converted flashers and holosigns.
Fixes to keep in line with upstream.
2015-11-22 22:32:52 +13:00
Loganbacca
750414e280 GC cleanup
Cleaned up some GC code and properly implemented it for wireless datums
Remote buttons are now fully working with emitters and crematoriums
2015-11-22 22:32:52 +13:00
Loganbacca
a9555b0175 Converted emitter remote control
Also converted crematoriums, although they are not working at the moment.
Removed redundant wireless manager file.
2015-11-22 22:32:51 +13:00
RavingManiac
b405c575cf Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2015-11-19 14:45:30 +08:00
Atlantis
661b5968d9 Updates gridcheck behavior
- Gridcheck random event is updated. Core behavior remains the same, but mechanism it uses to achieve power outage is changed.
- Both SMESs and APCs have new variable which is set by gridcheck. This variable decrements by 1 every tick, and until it is back to zero the APC/SMES won't work.
- SMESs are disabled for 60-120 seconds (random for each SMES). APCs for 120-240 seconds.
- Both SMESs and APCs show error UI with timer counting down until the device restarts (begins working again).
- Both SMEss and APCs may be manually restarted, on per-device basis, by clicking restart button in the UI. This is useful if you urgently need one or two devices back online, for example, medical treatment facilities, etc. This immediately skips the X second timer and restores the device to working state, while keeping the original intention of this event - allowing antagonists to use lack of power to enter areas they don't normally have access to.
2015-11-07 17:11:25 +01:00