Commit Graph

1058 Commits

Author SHA1 Message Date
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
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
PsiOmegaDelta
ae4d463fcb Map cleanup, tweaks and merge fixes. 2015-11-02 10:05:14 +01:00
PsiOmegaDelta
8b98b059a4 Merge pull request #11397 from Baystation12/dev-freeze
Dev freeze
2015-10-31 16:43:02 +01:00
PsiOmegaDelta
461023b5e7 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
2015-10-31 16:31:05 +01:00
Daranz
4b42f69247 Fix a problem with solar control computers not connecting to powernets on build 2015-10-28 13:35:24 -04:00
Atlantis
cbcddcad53 Adjustment according to PsiOmegaDelta's suggestion 2015-10-16 14:44:01 +02:00
Atlantis
c3e1611178 Fixes #11149
- Corrects APC behavior when hacked by malfunctioning AI.
- It should now be possible to hack the APC to unlock it even when it is hacked by the AI. Normal IDs still don't work on hacked APCs.
- A little side-fix, removal of malfunctioning AI's hack of an APC should now work correctly.
2015-10-16 14:38:20 +02:00
Kelenius
83adba88d4 Updates blob
Remains of player blob axed.
blob_act() axed. Blob now has an arbitary set of things it can attack.
It will flow over everything else. Blob has an awful tendency to destroy
non-craftables.
Will test more tomorrow.
Blob will now attack mechs.
Fixes #8106.
Fixes #10705.
2015-10-05 18:10:16 +03:00
PsiOmegaDelta
9dd1a54191 Destroy tweaks.
Ports Destroy() proc tweaks from Paradise and /tg/, sourced from https://github.com/ParadiseSS13/Paradise/pull/2091.
Adds returns in Destroy()s, to prepare for future return values.
2015-09-25 10:44:23 +02:00
PsiOmegaDelta
59f7b889d4 Constant fix. 2015-09-19 20:54:43 +02:00
PsiOmegaDelta
fa6799ec3a APCs now produce a glow.
APCs now produce a glow, with similar range and strength as fire and air alarms.
2015-09-19 10:12:02 +02:00
PsiOmegaDelta
f8a38ec7cf Improves powernet destruction.
While we currently do hard del datums this is a step towards a better world.
2015-09-16 08:00:22 +02:00
PsiOmegaDelta
a7fa8cde49 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/clothing/spacesuits/void/merc.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/simple_animal/borer/borer_captive.dm
	code/modules/mob/mob_grab_specials.dm
	code/modules/reagents/reagent_containers/food/drinks/bottle.dm
	html/changelogs/.all_changelog.yml
2015-09-11 08:54:03 +02:00
PsiOmegaDelta
f81ac77884 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/modules/mining/abandonedcrates.dm
	code/modules/mob/living/silicon/ai/ai.dm
2015-09-11 08:38:28 +02:00
PsiOmegaDelta
2007004f3c Qdel cleanup.
Replaces a few instances of del() with qdel().
2015-09-09 12:20:33 +02:00
PsiOmega
3a2b1be8e1 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-09-07 08:09:01 +02:00
PsiOmega
8dea4d40c0 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-09-07 08:01:15 +02:00
Zuhayr
dd81250b1b Merge pull request #10784 from Kelenius/masterRuntimes
Fixes two runtimes
2015-09-07 14:01:24 +09:30
Zuhayr
0c56bdd448 Merge pull request #10266 from PsiOmegaDelta/150722-TagPairs
Makes it possible to define multiple tag pairs for the Travis check.
2015-09-07 13:57:09 +09:30
Zuhayr
8c743329df Merge pull request #10955 from SkyMarshal/multi-z
Overhauls Multi-Z
2015-09-05 11:36:59 +09:30
Cael Aislinn
1de511b545 fixes emitter runtime by using new calling syntax
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
2015-08-31 16:41:43 +10:00