Commit Graph

4325 Commits

Author SHA1 Message Date
Zuhayr
cc52be3192 Merge resolution, replaced 2 wires lost in map merge. 2014-09-25 23:54:24 +09:30
Zuhayr
9272bc4542 Fixes #6351 and #6350. 2014-09-25 21:19:35 +09:30
Zuhayr
c232b4e921 Fixes #5451 by stealing JimTheCactus' and VampyrBytes' work - thanks dudes. 2014-09-25 20:07:11 +09:30
Zuhayr
cddbce688d Fix for potential infinite splint farming exploit in previous commit. 2014-09-25 19:43:17 +09:30
Zuhayr
b32d25b1bd Fixes #6503 2014-09-25 18:01:46 +09:30
Chinsky
69ed2317bf Merge pull request #6428 from atlantiscze/cyborg-power
Cyborg power overhaul
2014-09-25 00:19:13 +04:00
Atlantiscze
e7f3533158 Cyborg Lights
- Cyborg lights now use the reworked power system.
- Removed flashlight from cyborg modules, replaced with integrated light.
- "toggle-lights" verb is added for cyborgs, which de/activates the integrated light. Uses 30W (*modifier) of power when active.
- Cyborg lights have luminosity of 6 (flashlight has 4).
2014-09-24 09:41:19 +02:00
Zuhayr
0c83a95b90 Large merge resultion. Used remote for map conflicts. 2014-09-23 21:41:54 +09:30
PsiOmega
1e81d002aa pAI submission process change
Attempts  to fix  #6481.

Previously it appears observers would be asked once, and only once, if they wished to become a pAI.
If one closed the configuration window without pressing Submit you'd never get the chance to apply again.

Now asks observers every time someone requests a pAI, similar to posibrains and Dionaea pods.
There is already a built-in ask delay of one minute between such requests and ghosts can decide to opt out for the rest of the round.
2014-09-21 15:13:48 +02:00
Atlantiscze
312089d366 Emagged Cyborg Fix
- Emagged cyborgs now can select their special weapon.
2014-09-20 03:11:06 +02:00
Chinsky
1cb8a3ee15 Merge pull request #6454 from PsiOmegaDelta/pAI
Attempts to fix #6344
2014-09-19 10:49:21 +04:00
Walter0o
89f87d2dfb borer restore and fixes
- tried to merge the upstream and my version for you as best as i could, my version does differs in quite a few places
- reactivates my ID and IP fixes, these are needed so an offline borer or host mob don't cause bans and multikey alerts to fuck up, worst case you perma a few innocent players thanks to lazy coding. also how could they possibly fuck up control transfer??
- fixes the client DC bug properly, caused by spawning the brainmob prematurely in New()
- removed the runtime-error-triggering organ check, all mob restriction checks if wanted should happen on infest
- adds say logging and missing input sanitation

next time please ask me if you have questions, instead of making master file accusation comments that i might never read.
2014-09-18 21:52:57 +02:00
PsiOmega
b56dfa34fe Attempts to fix #6344
pAI configurations are not added to the list of available candidates.
2014-09-18 13:21:58 +02:00
Zuhayr
0f737f1d3b Merge pull request #6447 from Zuhayr/master
Proper tested fix for borer client crashes.
2014-09-18 16:34:12 +09:30
Zuhayr
0cf5852186 Proper tested fix for borer client crashes. 2014-09-18 15:24:31 +09:30
Chinsky
78a168ed55 Merge pull request #6416 from Hubblenaut/master
Fixes and Improvements Patch
2014-09-18 09:00:38 +04:00
Zuhayr
5c2e039e15 Borer fixes and tweaks. 2014-09-18 14:00:43 +09:30
Hubblenaut
da08ce2410 Fixes being able to lie down while buckled in movable chairs 2014-09-17 14:15:03 +02:00
Hubblenaut
0da33d5161 Adds size_multiplier, icon_update vars and stops masks and shoes from rendering beneath hardsuits 2014-09-17 13:58:17 +02:00
Atlantiscze
5b905ebde1 Cyborg Advanced Charging
- This solves various issues with cyborg charging
- Cyborg chargers have 15k charge capacity themselves. They charge at 2.5kW when no cyborg is inside and 25kW when cyborg is inside.
- Instead of draining power directly to cyborg's cell, they simply transfer power (capped at 250 charge/tick) from charger to cyborg.
- All is checked, which means no excess power is wasted. This means AFK cyborgs parked in rechargers are no longer power sinks

Balance
- Increased cyborg actuator power usage a bit.
2014-09-17 08:59:19 +02:00
Atlantiscze
ded8e21c0f Cyborg Power Usage Overhaul
- Adds new standardised proc for power usage as Cyborg
- Each component now uses different amount of power. Some components use "idle" power (camera), which means constant load. Other components use "active" power, which is single-time burst load.. Example: Actuator.
- Power usage is directly proportional to work done. Moving cyborg uses more power than still cyborg.
- Information in Status tab changed. Now it only shows percentage of remaining charge, as well as cell rating and cell load (W)
2014-09-17 07:31:20 +02:00
Atlantiscze
24080c4209 Cleanup - Cyborg Analyzer
- Moved cyborg analyzer related code to it's own file.
2014-09-17 02:23:45 +02:00
Snapshot
db36243410 Merge pull request #6380 from Zuhayr/master
Calamity fix.
2014-09-14 22:03:06 -07:00
Zuhayr
5bc64c3db3 Hopefully fixes the pAI verb refresh issue. 2014-09-15 01:56:21 +09:30
DJSnapshot
e6b5681db0 Rest of the fixes for custom borgs on module reset. 2014-09-14 06:22:46 -07:00
DJSnapshot
0ae3878c13 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into hotfix 2014-09-13 23:10:18 -07:00
PsiOmega
4ee887b5fd Re-adds the missing "Show Alerts" verb for the AI. 2014-09-13 14:17:07 +02:00
Zuhayr
1eb759447e Merge resolution, using dev-freeze map due to unreconcilable conflicts. 2014-09-13 16:54:48 +09:30
DJSnapshot
a672311f6d WIP fixes for custom borg sprites 2014-09-13 00:03:56 -07:00
Chinsky
2cf5af181f Merge pull request #6318 from PsiOmegaDelta/EyeOfTheNinja
Ninja-night vision now works.
2014-09-13 03:53:07 +04:00
PsiOmega
d123df4b98 Fixes #6311 2014-09-12 13:59:54 +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
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
Mloc-Argent
11ba197b30 fix for contaminants not processing if air is OK otherwise
also a small fix for VV

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-09-03 19:00:00 +01: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
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
aedb3725f2 Fixes #5874 2014-09-01 23:20:27 +09:30
Zuhayr
066772b1ce Fixes #5879 2014-09-01 22:45:37 +09:30
Zuhayr
ad2cf64c7b Fixes #6119 2014-09-01 22:41:15 +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
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
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
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