Commit Graph

8570 Commits

Author SHA1 Message Date
Zuhayr
e7dc41d156 Merge pull request #6262 from atlantiscze/substation-multifix
[Done..?]Substation multifix MK I
2014-09-13 12:58:43 +09:30
Chinsky
2cf5af181f Merge pull request #6318 from PsiOmegaDelta/EyeOfTheNinja
Ninja-night vision now works.
2014-09-13 03:53:07 +04:00
Atlantiscze
c5e5856e82 Merge branch 'dev' into substation-multifix 2014-09-12 20:11:42 +02:00
Atlantiscze
cbeff523ac Attempt to resolve merge conflict. I hope i won't break something. 2014-09-12 20:07:21 +02:00
PsiOmega
34346cf308 Ninja-night vision now works.
A ninja now uses proper glasses instead of using its own hack.
Fixed a bug that would override the old ninja-night vision unless one also wore additional glasses in the glasses-inventory slot.
Adds overlays to thermals and mesons as well. Slightly reduces the intensity of the night vision overlay.
2014-09-11 13:43:13 +02:00
Mloc-Argent
712e209ab6 Merge remote-tracking branch 'upstream/master' into dev
Conflicts:
	code/__HELPERS/text.dm
	code/game/machinery/podmen.dm
	code/game/machinery/vending.dm
	code/game/objects/items/candle.dm
	code/game/objects/items/devices/PDA/cart.dm
	code/modules/clothing/suits/jobs.dm
2014-09-10 22:14:37 +01:00
D Anzorge
697d8d5b35 Add grape juicing to reagent grinder 2014-09-07 10:36:43 -04:00
PsiOmega
98bc0d5f60 Fixes a bug where people who were in the lobby but not observers were considered non-survivors in shift-end feedback. 2014-09-05 11:00:47 +02:00
Atlantiscze
03f2be3091 PARTIAL IMPLEMENTATION - Charged SMES deconstruction & SMES code cleanup
- Cleanup of SMES attackby() code
- Buildable SMESs now have option to override safety circuit by using multitool while the hatch is open.
- Disabling safeties lets you disassemble SMES even if it's charged above 1%.
- If charge is above 5% stored energy may discharge violently. This is percentage based (more energy = higher chance of this occuring + more severe consequences)
- Larger discharges affect whole powernet, burning out some lights and even completely destroying APCs!
- Substation PSUs act as surge protection. Thus, if set up properly damage is limited to few areas which are directly on the main grid (= maintenance mostly)
- STILL NEEDS TESTING. Pushing so other people can review the code and give further suggestions. And because i need to access it on second computer.
2014-09-05 01:52:15 +02:00
PsiOmega
65bb6f8be1 Entities wearing sec/medical HUDs or corresponding now receive broadcast messages from relevant bots. 2014-09-03 18:50:46 +02:00
Atlantiscze
20d33815ba Breaker Box Fix
- Removes source of runtime errors. From my examination of code, it seems these errors happen when breaker box is turned off for the first time. It should work then.
- Mostly temporary fix, i intend to rework the powernet code over time. I would welcome cooperation with @mwerezak as he is currently doing lots of related things.
2014-09-02 17:09:37 +02:00
Atlantiscze
3ca0d1577f Breaker Box AI interaction fix
- AI can now properly interact with Breaker Box, without interacting BOTH as AI and human.
2014-09-02 17:02:36 +02:00
Atlantiscze
6905a90b9e SMES Construction rework
- Buildable SMES is now subtype of regular SMES.
- Buildable SMES related stuff moved to separate file (smes_construction.dm)

Please note that this commit is one of two commits which have to be applied together. Otherwise, compilation error occurs. (Code + Map. This one is Code)
2014-09-02 15:33:36 +02:00
Atlantiscze
8c983b317e SMES Board design fix
- Fixes SMES circuit board issue
2014-09-02 15:18:14 +02:00
Zuhayr
67cb6e297e Merge pull request #6254 from Kelenius/OfStacks
Of Stacks
2014-09-02 17:58:28 +09:30
Chinsky
367ddf6848 Merge pull request #6242 from PsiOmegaDelta/ExploitableAlternative
Antags - Exploitable Information - MKII
2014-09-02 11:18:50 +04:00
Kelenius
505f857eb8 Stack update 2014-09-02 09:59:32 +04:00
Zuhayr
68b587b95f Merge pull request #6116 from Hubblenaut/dev
Hazardly low pressure induces OxyLoss up to 55 points
2014-09-02 14:36:27 +09:30
Whitellama
71c2317264 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into flame
Conflicts:
	code/game/objects/items/weapons/storage/belt.dm
2014-09-01 18:31:26 -07:00
Zuhayr
08df83fc3d Merge pull request #6243 from Whitellama/bugfixes
Fixes tank dispenser sprites not updating, fixes combat belts not holding police tape, other bugfixes
2014-09-02 09:39:17 +09:30
PsiOmega
9e4b7ed265 Preliminary support for the new general information. Renames the exploit record to permanent record.
The new general information being:
Home system
Citizenship
Faction
Religion

Still to be made available in employment/security/medical records as applicable.
2014-09-01 14:45:47 +02:00
Whitellama
bdce104b6d Improved anomaly chat message cooldowns. 2014-08-31 17:51:13 -07:00
Whitellama
98e287bc6d Fixed xenobiologist having no preview clothes in character setup 2014-08-31 16:22:43 -07:00
PsiOmega
89b29eb0f0 One can now save exploitable information about the character, potentially to be used by antags. 2014-08-31 21:31:10 +02:00
D Anzorge
9d76b55eb7 Add headings to pencode
Allows for h1 through h3 use in pen-written text.
2014-08-31 09:46:45 -04:00
Whitellama
f5c9586153 Fixed matches and candles not being able to burn papers. Also made Diona join prompt appear for a bit longer. 2014-08-31 02:12:04 -07:00
Whitellama
628f56ce42 Nerfed celldrain/charge to a limited range and stopped anomaly effects from spamming synthetics 2014-08-31 01:48:52 -07:00
Ccomp5950
9952f47677 Merge branch 'engineering-substations' of https://github.com/atlantiscze/Baystation12 into atlantiscze-engineering-substations 2014-08-30 21:57:48 -05:00
Atlantiscze
975070c1ba ENGINEERING SUBSTATIONS!
- Mapped in engineering substations
- Completely reworked station wiring (Z level 1)
- Wire colours: Yellow - Local Power (engine, solars), Red - Main Grid, Green - Sub Grid (department grid)
- Adds breaker box variant that starts enabled
- Substation PSUs are now not set to charge themselves by default (as this caused quite large loads)
2014-08-31 03:52:38 +02:00
Atlantiscze
228fa21a46 Adds Fractal Energy Reactor
- Fractal energy reactor is infinite power source
- It is NOT mapped in. It is intended for map testing purposes when large amount of power is needed
- It is NOT buildable. Only way to obtain it is by spawning it.
- Outputted power can be varedited to your liking. Defaults to 2MW (should be enough for ... well, everything?)
2014-08-31 03:44:25 +02:00
MrSnapwalk
8551a81c2b Adds the Cybernetic Casings custom item. 2014-08-30 18:53:04 -05:00
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
Atlantiscze
7bb01ca020 Breaker Box update
- Added suggestions by mwerezak and comma
- Directions list is now in variable
- Type changed to /obj/machinery/power/breakerbox
- Instead of using loop visible_message() is used now.
2014-08-30 20:54:41 +02:00
Atlantiscze
cb52831268 SMES construction fix:
- You can no longer place coils into PSUs.
- SMES now properly checks max_coils var when installing new coils.
2014-08-30 16:21:03 +02:00
Atlantiscze
845c0a0b17 SMES (de)construction
- Adds Superconducting Magnetic Coils - SMES specific construction item.
- Each SMES can have up to 5 additional coils added , similar to PSUs with cells.
- It is possible to create multi coil SMESs by changing "cur_coils" variable while mapping them in.
- SMES can be deconstructed, salvaging their board and coil(s)
- It is currently not possible to obtain these by any other way than deconstructing existing SMESs. This will be added in another commit.
2014-08-30 15:55:38 +02:00
Ccomp5950
2ebe99017a Merge pull request #6213 from comma/voicetrigger
Ported new kinda of assemblies from TG - voice assembly.
2014-08-29 22:44:58 -05:00
Ccomp5950
1104bb4c15 Merge pull request #6212 from comma/typing
Adds typing indicator.
2014-08-29 22:44:37 -05:00
Ccomp5950
68f2833a3b Merge pull request #6208 from comma/forcesay
Ported forcesay from TG
2014-08-29 22:43:20 -05:00
Ccomp5950
23386da708 Merge pull request #6207 from comma/catching
Ported catching things from TG
2014-08-29 22:42:04 -05:00
Atlantiscze
e1b38f9d38 Adds Breaker Box
- Basically, reworked powerswitch. Powerswitch was commented out and this commit removes it completely, as Breaker Box is partially using it's code.
- Breaker box is device designed for advanced grid control. Allows you to connect/disconnect wires WITHOUT having to cut them manually.
- This update mostly improves interaction, and adds AI support (as i already saw many AIs which are actually good in balancing things. This will help them a bit. Engineers can do it manually too.)
2014-08-29 20:21:46 +02:00
Chinsky
6a90016b80 Added tracking of inactivity in chatbar.
Now indicator will disappear if for 30 seconds contents of chatbar didn't change.

Moved all relevant vars to the typing_indicator.dm
Added 'typing' var, as 'if(!(typing_indicator in overlays))' didn't work and overlays kept being added forever.
Fixed preference toggle feedback being backwards.
Fixed wrong verb called in hotkeys mode.
2014-08-29 21:12:55 +04:00
Chinsky
12364f0cd2 Adds typing indicator.
It's toggleable as client preference.
Displays dots(codersprite) near the mob when he starts typing a message.
Detects chatline me and say via checking contents.
Detects shortcut input me an say via hacky wrapper that's called now instead of direct say/me verbs.
2014-08-29 15:33:25 +04:00
Chinsky
54297a6865 Ported forcesay from TG
Stun batons and brute attacks have a chance to interrupt whatever guy was saying and send out incomplete version of whatever he had in chatbar.
Credit to Petethegoat.
2014-08-29 15:25:57 +04:00
Ccomp5950
83d61a9818 Merge pull request #6203 from PsiOmegaDelta/HUDs
Non-drone silicons now have access to a basic security xor medical hud.
2014-08-29 03:48:27 -05:00
Whitellama
b15c74acd0 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-08-28 18:29:05 -07:00
Chinsky
5f389e6fe7 Ported new kinda of assemblies from TG - voice assembly.
It can be set to trigger on hearing a specific phrase.
Credit to PeteTheGoat.
2014-08-29 04:42:20 +04:00
Chinsky
ca98cde944 Ported catching things from TG
If something hits human with throw intent on, he'll catch it instead of getting hit.
Uses speed var to determine if it's 2fast4catch.
credit to PeteTheGoat
2014-08-29 03:08:52 +04:00
PsiOmega
3b46636e0d Non-drone silicons now have access to a basic security xor medical hud. 2014-08-28 20:01:43 +02:00
Zuhayr
07da6e25f8 Merge pull request #6184 from comma/detfix
Fixed copypaste derp resulting in runtime when you are naked sans gloves...
2014-08-28 11:09:56 +09:30
Whitellama
bc47750801 Added trim to text inputs 2014-08-27 17:52:29 -07:00