Commit Graph
13845 Commits
Author SHA1 Message Date
mwerezak 5ca36fcadb Merge branch 'dev' into power-net
Conflicts:
	code/game/machinery/Freezer.dm
	code/ATMOSPHERICS/components/unary/heat_source.dm
	code/modules/organs/organ_external.dm

Also updated:
	code/ATMOSPHERICS/components/binary_devices/pump.dm
	nano/templates/gas_pump.tmpl
2014-07-16 16:14:52 -04:00
Zuhayr f4ff51f146 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-07-16 19:32:00 +09:30
Zuhayr f795712a95 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev 2014-07-16 19:30:41 +09:30
Chinsky bd080c237f Merge pull request #5641 from JimTheCactus/limb_sparks_fix
Fixes #5640 Make sparks effect target mob, not organ
2014-07-16 13:03:14 +04:00
Chinsky d04433aa87 Merge pull request #5626 from mwerezak/damage-fixes
A few damage and defence related fixes
2014-07-16 12:19:29 +04:00
Chinsky 47a61c66a7 Merge pull request #5629 from mwerezak/throwing
Fixes #5586
2014-07-16 12:19:15 +04:00
Chinsky a7379f925a Merge pull request #5634 from Whitellama/master
Made LOOC show character names of living players, fixing #5633
2014-07-16 12:18:49 +04:00
Chinsky 857cbe23bf Merge pull request #5635 from mwerezak/air-alarm-fix
Fixes air alarms not updating icons, fixes siphoning or cycling being stopped even though environmental mode is set
2014-07-16 12:17:52 +04:00
Zuhayr 9fe00c09a6 Merge pull request #5625 from JimTheCactus/med_records_fix
Corrects Issue With Record Entries Containing All Whitespace (#5538)
2014-07-16 15:32:29 +09:30
mwerezak 3c65c7dda4 Vent pumps now draw power 2014-07-16 00:47:38 -04:00
mwerezak ec676896bc Some gas pump cleanup 2014-07-16 00:45:38 -04:00
JimTheCactus ff382bb231 Fixes #5640 Make sparks effect target mob, not organ
The malfunction sparks were calling to a var src, which in most other places is the main object itself, here that's the organ and it doesn't have a loc. Changed it to call the organ's owner.
2014-07-15 20:34:08 -06:00
mwerezak aeb3537ae4 Improves update_use_power() proc
Now no longer misses power usage on the tick that it is called
2014-07-15 20:35:10 -04:00
mwerezak 1011800d78 Updates gas heaters
Gas heaters now draw power.
Removed the heat_resevoir base type because it was dumb and unused.
Adds a circuit board for gas heaters.
2014-07-15 20:34:48 -04:00
mwerezak f207888316 Replaces the volume gas pump 2014-07-15 19:31:02 -04:00
Atlantiscze db18074f90 Designed to replace AI's intercoms. Integrated headset-like device which has access to all department frequencies. Also let's AIs use radio on intellicard.
AI's communication can however be disabled by using intellicard option. Communication will be disabled until it is restored via intellicard again,
even if the AI is moved back into physical core. ICly it's software lock which prevents the AI from using communication circuits which are standard in all
AI cores/intellicards/etc. This does not stop AI from using intercom, however.

 Forum link: http://baystation12.net/forums/viewtopic.php?f=5&t=6536&start=1260
2014-07-16 00:54:54 +02:00
mwerezak a4bef09a69 Fixes air alarm icons not updating
I'm not sure how I missed that the first time.
2014-07-15 18:27:15 -04:00
mwerezak c469b188ee Fixes air alarms not siphoning or cycling 2014-07-15 16:35:03 -04:00
Whitellama 8ec8c615e4 Made it so admins see global LOOC character names/BYOND keys based on whether that player is alive/dead 2014-07-15 13:33:52 -07:00
mwerezak 90f7029f4e Adjusts the volume change in space
Did some playtesting with energy guns and revolvers in space.
2014-07-15 16:26:05 -04:00
Whitellama 866a486ad6 Made LOOC show character names of living players and BYOND keys of observing/dead players 2014-07-15 12:55:21 -07:00
mwerezak 005c6589c2 Limits hearing sounds in a vacuum 2014-07-15 15:30:10 -04:00
mwerezak 5718c907ea Adds a flow rate meter to pump UI
Also fixes a stupid merge error.
2014-07-15 13:05:58 -04:00
mwerezak 39789d56b8 Merge remote-tracking branch 'loganbacca/atmosmerge' into power-net
Conflicts:
	code/ATMOSPHERICS/components/binary_devices/pump.dm
2014-07-15 12:12:08 -04:00
mwerezak 08f45dc1cf Thrown sharp objects no longer always embed 2014-07-15 02:33:52 -04:00
mwerezak dbf507062e Moves human specific hitby code to human_defense 2014-07-15 02:33:27 -04:00
Ccomp5950 67bf27e6f4 Merge pull request #5602 from Hubblenaut/food
Grid Placement for Food
2014-07-15 01:22:47 -05:00
mwerezak 852215834a Bad indentation causing robot modules to embed 2014-07-15 01:55:24 -04:00
mwerezak fd6181c54f Fixes melee attacks using area effect armour values
def_zone is normally not set when attacking with a melee weapon, and the
melee armour check didn't use target_zone for some reason.
2014-07-15 01:37:29 -04:00
mwerezak 4448784402 Fixes suits being punctured by projectiles when...
...fully blocked by a shield.
2014-07-15 01:37:08 -04:00
mwerezak f49e709394 Fixes organs not being removed due to damage
Because the dismemberment check was being done before brute_dam was
updated, the attack that actually brought brute_dam above the threshold
would not be able to pass the check, regardless of how much damage was
actually done.
2014-07-15 01:36:48 -04:00
mwerezak 2edfda5682 Thrown momentum no longer depends on fingerprints 2014-07-15 01:26:08 -04:00
mwerezak f2845dbe76 Thrown items can be targeted, has miss chance...
...based on distance, similar to projectiles.
2014-07-15 01:14:04 -04:00
mwerezak 836d2e40a8 Adds miss chance and shield checks to thrown atoms
Also makes setting a thrown atom's throwing var the responsibility of
the handler, so that impact handling code can decide if the thrown atom
should keep on going.
2014-07-14 23:53:27 -04:00
JimTheCactus 41904850d4 Fixed not-quite-blank field issues in the various record keeping computers.
Added trim to most fields in Medical Computer
Added trim to most fields in Staff Computer
Added name verification in Staff Computer
Added trim to most fields in Security Computer
Added name verification in Security Computer
2014-07-14 20:55:39 -06:00
mwerezak 177560cf4b Moves turf collision handling into living_defense 2014-07-14 22:06:14 -04:00
Zuhayr d050f0a30b Merge pull request #5620 from Decius-R/loyalty_implants
Loyalty Implants
2014-07-15 10:30:48 +09:30
Decius-R 8d8e3f43d4 Fixed a small mistake..
Forgot to remove where I was going to originally make a proc. Didn't see it at skim through. Fixed.
2014-07-14 19:14:38 -04:00
Decius 0b314561ca Now allows admin override via player panel, a small fix, and...
implantation works again. Since they'll only be accessible via an admin
specifically spawning it, except for in cases where it is configured
to be allowed, it'll be fine.

This now allows admins to incorporate loyalty implants still if they so
wish for whatever reason, but it is normally inaccessible.

Signed-off-by: Decius <deciusreln97@gmail.com>
2014-07-14 19:02:21 -04:00
Mloc 48cea3dbb3 Merge pull request #5578 from Faerdan/dev
NanoUI Update
2014-07-14 23:35:49 +01:00
Decius b37ce454df Removed from map + made implanters conform to configuration...
Signed-off-by: Decius <deciusreln97@gmail.com>
2014-07-14 18:02:04 -04:00
Decius 203c36114d Made spawning with a loyalty implant compliant to configuration...
Created a proc for being implanted with loyalty implant which
checks for the configuration for whether or not it will work. If it is
enabled, it continues on-- if it is disabled, it returns from the proc.

Also made secure closets not automatically spawn them unless the config
is set to allow it.

Admin 'loyalty implanting' via the panel is now compliant to the
configuration file. If preferred, I am willing to make an override variable
to the proc that will allow admins to do it anyway.

Supply pack for it commented out due to inability to make it conform.
Easy enough to re-add back for anyone downstream if they wish it. Same
applies to the design.


Signed-off-by: Decius <deciusreln97@gmail.com>
2014-07-14 17:21:11 -04:00
Hubblenaut c920b0234f Renames CoM into center_of_mass 2014-07-14 23:13:46 +02:00
Decius 0dabf4fc0a Added in loyalty implant as a configuration...
Also reorganized a few configurations to be more intuitive and readable.
Just spaces and moving around on the switch thingy.

Signed-off-by: Decius <deciusreln97@gmail.com>
2014-07-14 16:27:07 -04:00
mwerezak 2f0e4a1729 update_use_power() now doesn't force updates...
...if it doesnt need to.
2014-07-14 13:13:23 -04:00
Mark Aherne fd0ee4cf2f Fixed comments for new JS files in nanoui.dm.
Changed the BYOND cache path in "To BYOND Cache.bat" to a dynamic path.
2014-07-14 11:50:25 +01:00
Loganbacca 6b64fb5e77 Pipe rendering rewrite
- Complete rewrite of pipe rendering code. It now selects icons from a shared cache.
- Manifolds and other devices (pumps, filters, etc.) now match the color of the connected pipes.
- Updated omni devices to use the shared cache.
- Set separate pipe color definitions.
- Cleaned up a lot of pipe code, converting it to absolute paths and removing old commented out code.
- Tweaked t-ray rendering code.
- Tweaked pipe painter.
- Enhanced pipe checking debug command.
- Expanded tank capacity and resprited them.
2014-07-14 19:12:22 +12:00
Whitellama 60bc22e829 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-07-13 23:24:32 -07:00
Whitellama a6b4f5d2aa Fixed issues with cans complaining twice when trying to drink unopened and with transfering fluids between closed cans 2014-07-13 23:23:26 -07:00
Zuhayr 16c1494d7f Merge pull request #5613 from comma/master
Fixes #5563
2014-07-14 15:49:19 +09:30