Commit Graph

1149 Commits

Author SHA1 Message Date
Ccomp5950
c56ec21ee3 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm
2014-02-26 09:34:38 -06:00
Mloc-Argent
f5ab084eac Fixes admin attack logs to show up in-game as well as in the logfiles.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-02-25 20:36:46 +00:00
Chinsky
0ba65efd18 Merge pull request #4477 from Ccomp5950/runtimefixes
Runtimefixes
2014-02-25 06:01:59 +04:00
Ccomp5950
1eb66f1f78 Runtime fix blood_DNA length checks when it's possibly null.
runtime error: Cannot read null.len
proc name: attack self (/obj/item/weapon/melee/telebaton/attack_self)
  source file: swords_axes_etc.dm,156
2014-02-24 00:47:55 -06:00
suethecake
32de00eed8 Fix to cloned gun issue - now your holster is located on your tactical armor. 2014-02-22 21:50:21 -06:00
Segrain
05c82c970b Tiny fix. 2014-02-22 06:56:51 +03:00
Segrain
2b9842c113 Smallfix. 2014-02-22 06:56:12 +03:00
Loganbacca
31c24df5e8 Chem grenade fix
- Restored "steam" code to chem grenades to handle grenades that don't have any reagents in them that react i.e. water grenades. (I removed it thinking it was only in there for handling foam reagents, but it seems it has more uses.)
This splashes the surrounding area in whatever reagents were leftover in the grenade after all reactions have occurred.
2014-02-15 23:30:56 +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
Rob Nelson
fa20b9c2ee DNA2 Bug Fixes - Part 2 (CHERRY PICK)
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.

Conflicts:
	code/game/dna/dna2_domutcheck.dm
	code/game/dna/genes/powers.dm
2014-02-10 22:46:28 -06: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
RKF45
8fbcda2a0b Reintroducing the dough-based cooking system. 2014-02-01 02:17:38 +01: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
8850a43dcb Fixes #3847 2014-01-30 23:21:00 +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
Chinsky
ada2ba9a2f Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into color
Conflicts:
	code/modules/power/cable.dm
	icons/obj/power_cond_red.dmi
2014-01-27 02:27:27 +04:00
Chinsky
5a8eb3c455 Merge pull request #4318 from Loganbacca/engineroom
Engine Room Redesign
2014-01-19 21:22:45 -08:00
Loganbacca
24c6063a07 Updated Supermatter user manual sprite 2014-01-20 01:57:58 +13:00
Chinsky
669ae9a1ae Made cables use color var instead of separate icons for each color.
It allows for wires of ANY color (just set cable_coil var)
and most importantly
40 837 958 b - before
39 506 651 b - after
2014-01-19 03:02:58 +04:00
RKF45
5649bb7fe2 Various tiny improvements 2014-01-18 22:15:46 +01:00
Ccomp5950
8a179a8ff1 Merge pull request #4299 from Faerdan/dev
Canister, Tank & Tank Transfer Value NanoUIs.
2014-01-15 15:21:47 -08:00
Mark Aherne (Faerdan)
024a0baa49 Canister, Tank & Tank Transfer Value NanoUIs.
* Added Canister, Tank & Tank Transfer Value NanoUIs.
2014-01-15 01:08:45 +00:00
RKF45
b9c747aeaf Makes mixing paints actually make sense 2014-01-12 12:04:18 +01:00
RKF45
fabfceaa5a Fixed forever! 2014-01-11 22:50:22 +01:00
RKF45
8758ece582 Alright already. 2014-01-11 22:42:42 +01:00
RKF45
140fb27889 Fixes 2014-01-11 22:36:35 +01:00
RKF45
ab8763378b Paint mixing 2014-01-11 22:19:02 +01:00
DJSnapshot
1e4abf785e Merge pull request #4237 from Mloc/bs12-tgstuff
[TG] Lots of small (and maybe not so small) changes from tg.
2014-01-09 22:33:28 -08:00
Mloc-Argent
dfe18845be Merge remote-tracking branch 'upstream/dev-freeze' into dev 2014-01-09 17:42:30 +00:00
SkyMarshal
d43b2fa492 RCDs no longer create plating with air on it.
Fixes #3545
2014-01-08 17:50:59 -07:00
Kyrah Abattoir
f91b44b47f correct paint can names and plural status, corrected pill box names, corrected lockbox names. 2014-01-08 19:56:03 +00:00
Kyrah Abattoir
98f02be5a6 code/game/object/items/weapons/* lowercase pass
code/game/object/structure/* lowercase pass (start)

Conflicts:
	code/game/objects/items/weapons/AI_modules.dm
	code/game/objects/items/weapons/paint.dm
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/objects/items/weapons/storage/uplink_kits.dm
	code/game/objects/items/weapons/vending_items.dm
	code/game/objects/items/weapons/weaponry.dm
	code/game/objects/structures/bedsheet_bin.dm
	code/game/objects/structures/door_assembly.dm
2014-01-08 19:56:00 +00:00
DJSnapshot
b294174acb Openable soda cans and beer bottles! 2013-12-31 17:52:12 -08:00
Chinsky
d166d3c992 Merge pull request #4100 from Zuhayr/dev
DNA2 EPISODE 2: Revenge of the Bugs
2013-12-25 03:49:58 -08:00
Zuhayr
ff52920fab DNA2 fixes cherrypicked from N3X15. 2013-12-23 00:06:56 +10:30
Zuhayr
197d4993cf Merge pull request #4087 from comma/nostalgy
Revisiting my first commits.
2013-12-22 05:28:35 -08:00
Zuhayr
b9fcd34df3 Merged config and changelog. 2013-12-22 23:11:29 +10:30
Zuhayr
11f8a5835f Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-12-19 00:01:12 +10:30
Chinsky
65fa11d496 Revisiting my first commits.
Updated ashtray to actually accept cig butts and crush lit cigs properly.
Applied random transform to cig butts, and made fingerprints from original cig carry over.
2013-12-18 12:02:20 +04:00
Zuhayr
8d76690f44 Fixes #4042 2013-12-18 10:30:59 +10:30
Mloc-Argent
b175c6906b Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev
Conflicts:
	html/changelog.html
2013-12-13 19:13:43 +00:00
Ccomp5950
fea1819260 Runtime fix: It was a bad idea to have this stuff in New()
So now it gives a default values and moves on.
2013-12-07 05:17:04 -06:00
Zuhayr
17380e308e Extra check in secure case interaction for aliens. 2013-12-05 22:04:11 +10:30
Zuhayr
a110cfaed7 Fixes #4030 2013-12-05 21:58:33 +10:30
Zuhayr
edabf18323 Merge pull request #4012 from N3X15/dna2
DNA2 - A recode of DNA
2013-12-05 02:39:55 -08:00