Commit Graph

6589 Commits

Author SHA1 Message Date
Aryn
a2d992ef5c Fixed inexplicable reversions. 2014-02-19 17:11:09 -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
Chinsky
499e364971 Merge pull request #4416 from Loganbacca/foam
Chem grenade fixes
2014-02-14 01:35:27 +04: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
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
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
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
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
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
RKF45
5869a3fc38 PDA bombs are now more balanced and random. 2014-02-07 23:28:40 +01:00
Rob Nelson
a8d3c0601b And now tested in game, with some fixes. 2014-02-06 23:52:58 -08:00
Rob Nelson
3121e4fb2d DNA2 Bug Fixes - Part 2
We discovered that most of the problems were were having was because of BYOND passing lists (e.g. SE and UI) by-ref instead of the assumed by-val.

This commit adds dna.Clone() and (UI|SE).Copy() where needed.  These should be used where DNA or SE/UI lists are COPIED, otherwise changes made in the reference will affect the real strand.

This change also messes with the gene activation logic.
2014-02-06 23:07:35 -08:00
DJSnapshot
64ff444fa7 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into antag
Conflicts:
	icons/mob/uniform.dmi
2014-02-04 23:55:27 -08:00
DJSnapshot
9c803dc1f6 Added the rest of the objectiveless antag types 2014-02-04 23:51:34 -08:00
DJSnapshot
3026a1306a Merge branch 'master' of https://github.com/Baystation12/Baystation12 into antag 2014-02-04 15:10:13 -08:00
Segrain
4b8d5c4f14 Code cleanup. 2014-02-04 08:16:06 +03:00
Segrain
3ab805f7c9 Moving flasks into Booze-O-Mat. 2014-02-03 04:55:42 +03:00
Segrain
cec9b87289 Folder recipes. 2014-02-03 04:45:42 +03:00
Segrain
55605624eb Gamemode autovote. 2014-02-03 04:43:38 +03:00
Segrain
b7059519c2 Merge remote-tracking branch 'upstream/master' into dev 2014-02-03 04:36:03 +03:00
RavingManiac
30915b5ba4 Escape shuttle modified after feedback.
Wall emergency lockers now contain two breath masks and two emergency oxygen tanks.

Emergency ration crates contain two boxes of donk-pockets. The escape shuttle has two crates at the back.
2014-02-02 16:04:11 +08:00
Segrain
88e7dbb67f Fix for mods counting. 2014-02-02 02:33:53 +03:00
RKF45
8fbcda2a0b Reintroducing the dough-based cooking system. 2014-02-01 02:17:38 +01:00
DJSnapshot
810de4ddaa Merge pull request #4337 from Baystation12/dev-freeze
0.1.8 Staging [Do not merge]
2014-01-31 12:40:15 -08:00
Segrain
4e17dc0b93 Sanity checks. 2014-01-31 16:21:05 +03:00
Segrain
4c87838e64 Double call removal. 2014-01-31 16:19:22 +03:00
Segrain
9fdd34b1ba Removal of double reporting. 2014-01-31 00:28:25 +03:00
Segrain
9a70dd3d13 Objectives fix. 2014-01-31 00:25:44 +03:00
Segrain
75c88634f7 Definition usage. 2014-01-31 00:22:24 +03:00
Ccomp5950
f136fa1db2 Merge branch 'dev' of github.com:Baystation12/Baystation12 into dev
Conflicts:
	icons/mob/mask.dmi
2014-01-30 12:56:23 -06:00
Ccomp5950
7962bd3277 Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev
Conflicts:
	code/modules/supermatter/supermatter.dm
	maps/tgstation2.dmm
2014-01-30 12:44:33 -06:00
Zuhayr
09ac26818d Merge pull request #4358 from SueTheCake/armors
Tactical Armor Storage + Tac Armor REDUX
2014-01-30 10:33:46 -08:00
Ccomp5950
975433f898 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
Conflicts:
	icons/mob/back.dmi
	icons/mob/mask.dmi
2014-01-30 12:14:44 -06:00
Zuhayr
f08e6c804d Rogue comma, kill it. 2014-01-30 23:33:57 +10:30
Zuhayr
8850a43dcb Fixes #3847 2014-01-30 23:21:00 +10:30
Zuhayr
851576b444 Fixes #3907 2014-01-30 22:46:48 +10:30
Zuhayr
97442f4727 Adding Kilakk's fix for #4145 2014-01-30 22:31:22 +10:30
Zuhayr
65252e174b Fixes #4089 2014-01-30 22:18:01 +10:30
Zuhayr
651599a669 Fixes #4306 2014-01-30 21:35:02 +10:30
Zuhayr
7a36d1c9bc Fixes #4346 2014-01-30 21:30:58 +10:30
suethecake
6f69e7f821 Stuff. 2014-01-29 18:15:35 -06:00
Zuhayr
c0b91504b4 Recommitting a ton of files as one commit due to needing to reset this repo to an earlier point in the log. Full changes in PR. 2014-01-28 15:59:50 +10:30
Zuhayr
9d7b42f6b6 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-01-27 20:55:42 +10:30