Commit Graph

16136 Commits

Author SHA1 Message Date
Aryn
a2d992ef5c Fixed inexplicable reversions. 2014-02-19 17:11:09 -07:00
Aryn
83fdc0942c Completed arduous process of standardizing new code. 2014-02-19 16:56:53 -07:00
Aryn
bc971b01ea New ZAS version, stable and efficient. Git broke the everything so it's in one commit. 2014-02-19 16:47:53 -07:00
DJSnapshot
2a28269363 Merge pull request #4398 from RKF45/pdabomb
PDA bombs are now more balanced and random.
2014-02-14 16:40:26 -08:00
Mloc
377d5017cf Merge pull request #4426 from Loganbacca/dev
Chem grenade fix
2014-02-14 08:46:17 +00:00
Loganbacca
d378eb0692 Chem grenade fix
Missed this in my last commit:
- Added a result amount for chemsmoke so it calculates the created_volume correctly
2014-02-14 15:44:45 +13:00
Chinsky
499e364971 Merge pull request #4416 from Loganbacca/foam
Chem grenade fixes
2014-02-14 01:35:27 +04:00
Ccomp5950
c653c37586 Merge pull request #4408 from Loganbacca/airlock-merge
Airlock controller rewrite
2014-02-13 13:02:37 -06:00
Loganbacca
d1b37a5392 Fixed cable colors
- Fixed a couple of lines of code in power.dmi so that cables correctly update their color
- Fixed the contrast of the cable icons
2014-02-13 17:05:07 +13:00
Loganbacca
63a03f4e29 Airlock update
- Should now merge
2014-02-13 14:23:02 +13:00
Loganbacca
d35fbfd562 Airlock controller rewrite
- /datum/computer/file/embedded_program moved from embedded_controller_base.dm to code/game/machinery/embedded_controller/airlock_program.dm
- embedded_controller_base.dm cleaned up and identical parts of the controller subtypes were moved here
- embedded_controller subtypes moved to code/game/machinery/embedded_controller/airlock_controllers.dm
- Added nanoUI templates for airlock controllers
- Added a couple of classes to nano/css/shared.css for colouring buttons
- Minor map update to maintain airlock compatibility and fix a broken airlock near virology
2014-02-13 14:23:02 +13:00
Loganbacca
8fc4e4e7db Minor tweaks and fixes for airlock equipment
- Fixed DP vent pumps not changing direction
- Made airlock_sensor more versatile (and backwards compatible with old airlock code)
- Added airlock_sensor and access_button airlock subtypes for easier mapping
2014-02-13 14:21:18 +13:00
Loganbacca
02810f7e89 Chem grenade fixes
Fixes #3986

- Foam reagent inheritance fixed:
The trans_to() proc in Chemistry-Holder.dm was calling handle_reactions() every time it would add and remove reagents with add_reagent() and remove_reagent(). I've added a safety flag to both of these procs (and copy_to()) so that trans_to will not call handle_reactions() until it has added all the reagents to the target container. This allows foam to reliably take on the properties of other leftover reagents.

- Fixed a bug in effect_system.dm that wasn't applying reagents from foam to the environment.

- Tweaked smoke to apply reagent effects after it has stopped moving
This was causing huge reagent spam at the center of the smoke cloud as it was spawning, since they were being applied every time the cloud of smoke moved. Also changed it to apply the effects 2-3 times at longer intervals (2 seconds).

- Smoke also only effects tiles in a 3x3 grid now, rather than 5x5.

- Summary:
Chem smoke does slightly less damage (if it contains damaging reagents)
Chem smoke proc calls reduced by 60-70% (significant lag reduction)
Foam works properly again
Foam proc calls reduced by 70-80%
2014-02-13 00:15:02 +13:00
Ccomp5950
942ce6ebc7 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev 2014-02-11 18:07:19 -06:00
Ccomp5950
5a52980dad Merge pull request #4414 from alex-gh/movement_halloss_fix
Fixed halloss not slowing you down.
2014-02-11 18:07:36 -06:00
alex-gh
841333bc30 Fixed halloss not slowing you down 2014-02-11 18:01:37 +01:00
Chinsky
15ca85edf9 Merge pull request #4411 from Ccomp5950/pda-size
NanoUI PDA - Decreasing initial size of the screen.
2014-02-11 17:18:16 +04:00
Chinsky
6121eeb5f5 Merge pull request #4413 from Ccomp5950/ai_toggle_camera
Bugfix:  AI Camera light toggle
2014-02-11 16:37:53 +04:00
Ccomp5950
62b70bb827 Bugfix: AI Camera light toggle
Fixes #3676

Before:  Toggling would get stuck where it wouldn't toggle the camera until you reset your view.

After:  Camera light toggles, you have to toggle off before turning on a new camera light though.
2014-02-11 03:20:22 -06:00
Ccomp5950
8ae8949b10 NanoUI PDA - Decreasing initial size of the screen.
Gonna miss my XBOX-LARGE pda screen.
2014-02-11 00:56:42 -06:00
Ccomp5950
05d4a6da08 Merge pull request #4400 from Loganbacca/re-engineering-merge
Engineering remap
2014-02-11 00:27:37 -06:00
Chinsky
a543b046fe Merge pull request #4409 from Ccomp5950/ghost-pda
Ghosts can see PDA messages.  (Redo: PR #4065 lost in merge)
2014-02-11 06:59:20 +04:00
Loganbacca
99c0cdb403 Major engineering remap
Thread with details and map here: http://baystation12.net/forums/viewtopic.php?f=5&t=9569
2014-02-11 15:52:31 +13:00
Ccomp5950
5810970352 Ghosts can see PDA messages. (Redo: PR #4065 lost in merge) 2014-02-10 20:42:32 -06:00
RKF45
054df7a28b Keeping the PDA sane. 2014-02-10 21:14:04 +01:00
Chinsky
47083c63ef Merge pull request #4406 from Loganbacca/bullets
Bullet inscriptions
2014-02-10 15:48:58 +04:00
Ccomp5950
af4233315d Merge pull request #4405 from Segrain/master
Bugfixes.
2014-02-10 00:38:01 -06:00
Segrain
26f40359fc Fix for unpinning humans. 2014-02-10 01:38:32 +03:00
Segrain
cba6dac062 Fix for unlocking exploit. 2014-02-09 13:34:40 +03:00
Segrain
5bead0c183 Adding blood to humans. 2014-02-09 13:32:42 +03:00
Segrain
8e11dabf96 Bloody feet. 2014-02-09 13:30:28 +03:00
Segrain
b4a8c370ba Colouring before updating. 2014-02-09 13:21:18 +03:00
Segrain
be61c65edd Proper indentation. 2014-02-09 13:12:49 +03:00
Loganbacca
d50d49cedb Bullet inscriptions
- Can inscribe text into bullets by using a screwdriver on a bullet casing
- Does not work on non-metal type bullets (i.e. rubber bullets, beanbags, stunshots, etc)
- Added weakbullet subtypes "rubber bullet" and "beanbag" with appropriate names
2014-02-09 22:52:27 +13:00
Chinsky
e5194bf356 Merge pull request #4399 from DJSnapshot/Security
Switched Security EOD closet to the Actual Security EOD closet.
2014-02-09 11:33:12 +04:00
Chinsky
d4aaf25080 Merge pull request #4402 from Ccomp5950/pda-scroll
PDA-Nano refresh / scroll fix (Messages/Notes/Records)
2014-02-09 11:32:15 +04:00
DJSnapshot
cf67b34780 Merge pull request #4401 from Ravensdale/APC
Self-naming APC's! Now even mapped in APC's will rename themselves
2014-02-08 18:18:29 -08:00
DJSnapshot
b47acbbcfb Merge pull request #4396 from RKF45/blob
Readjusts blob random event
2014-02-08 18:17:17 -08:00
DJSnapshot
7dddfc08b6 Merge pull request #4403 from Loganbacca/bayfix
Fixed shrapnel embedding
2014-02-08 18:15:55 -08:00
Loganbacca
b34ceb5cfd Fixed shrapnel embedding 2014-02-09 14:56:16 +13:00
Ccomp5950
9103717268 PDA-Nano refresh / scroll fix (Messages/Notes/Records)
Problem:  NanoUI auto updates, if you have a div with a scroll bar it will automatically scroll to the top.

Solution:  Remove the set size on these div's that have this issue and let the entire screen scroll instead since that isn't messed with on refresh.
2014-02-08 16:37:20 -06:00
Ravensdale
677e8a29c8 Tweak APC self-naming so they read better when examined or interacted
with. Thanks Sky for the suggestion and Mloc for the why.
2014-02-08 06:04:33 -08:00
Ravensdale
9d1e160a60 Self-naming APC's! Now even mapped in APC's will rename themselves
depending on what zone they're in. Makes more mapping sanity.
2014-02-07 21:48:37 -08:00
Loganbacca
60c61bed77 Sprite additions and updates
- Fixed passive gate sprite (east and west "on" sprites were reversed)
- Added new Supermatter manual sprite (it glows!)
- Added some floor variants (loading outline for plating - in yellow and aqua, caution stripes for old floor tiles, and yellow and grey checkered floor tiles)
2014-02-08 18:35:24 +13:00
Loganbacca
4b1bb13ace Crate and closet updates
- Added atmos themed sprite for atmospheric technician secure closets
- Added a second radiation suit to radiation suit closets
- Added a solar pack crate (because adding crates to the map with this many objects manually is silly)
2014-02-08 18:35:13 +13:00
Loganbacca
3978492ca4 Removed ID requirement for gas filters
So they can be used in other areas of the station (like toxins and the engine room) without needing atmos access to change settings.
2014-02-08 18:35:01 +13:00
Loganbacca
e26844df12 New areas for engineering remap
- Also moved hallway from Caels Rust areas.dm file to main Space Station 13 areas.dm file
2014-02-08 18:34:32 +13:00
DJSnapshot
779329455a Switched Security EOD closet to the Actual Security EOD closet. 2014-02-07 19:27:17 -08:00
DJSnapshot
2164cb33da Merge branch 'master' of https://github.com/Baystation12/Baystation12 into Security 2014-02-07 19:23:31 -08:00
RKF45
5869a3fc38 PDA bombs are now more balanced and random. 2014-02-07 23:28:40 +01:00